- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Make sure sighandlers.h is listed in noinst_HEADERS
by alex＠arthur.barton.de 05 Okt '10

05 Okt '10

Module: ngircd.git Branch: master Commit: ade8902b88a525622a40dc3c2276e35a8dad29ac URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ade8902b… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 5 21:57:01 2010 +0200 Make sure sighandlers.h is listed in noinst_HEADERS ... because it must be included in the distribution archive :-) --- src/ngircd/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/Makefile.am b/src/ngircd/Makefile.am index 8987c85..2e8b2e5 100644 --- a/src/ngircd/Makefile.am +++ b/src/ngircd/Makefile.am @@ -31,7 +31,7 @@ noinst_HEADERS = ngircd.h array.h channel.h client.h conf.h conf-ssl.h conn.h \ conn-func.h conn-ssl.h conn-zip.h hash.h io.h irc.h irc-channel.h \ irc-info.h irc-login.h irc-mode.h irc-op.h irc-oper.h irc-server.h \ irc-write.h lists.h log.h match.h numeric.h op.h pam.h parse.h proc.h \ - rendezvous.h resolve.h defines.h messages.h + rendezvous.h resolve.h sighandlers.h defines.h messages.h clean-local: rm -f check-version check-help lint.out

1 0

Alexander Barton : const'ify ngt_SyslogFacilityName() function
by alex＠arthur.barton.de 05 Okt '10

05 Okt '10

Module: ngircd.git Branch: master Commit: 3a826b774a10a069d2f18b1a07842acf8da8fc49 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3a826b77… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 5 20:16:35 2010 +0200 const'ify ngt_SyslogFacilityName() function This fixes the following gcc compiler warning: tool.c: In function 'ngt_SyslogFacilityName': tool.c:195: warning: return discards qualifiers from pointer target type --- src/tool/tool.c | 2 +- src/tool/tool.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tool/tool.c b/src/tool/tool.c index fa69ffb..9e29074 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -186,7 +186,7 @@ CODE facilitynames[] = { #endif -GLOBAL char +GLOBAL const char *ngt_SyslogFacilityName(int Facility) { int i = 0; diff --git a/src/tool/tool.h b/src/tool/tool.h index ea9e96b..4513a23 100644 --- a/src/tool/tool.h +++ b/src/tool/tool.h @@ -30,7 +30,7 @@ GLOBAL char *ngt_UpperStr PARAMS((char *String )); GLOBAL char *ngt_LowerStr PARAMS((char *String )); #ifdef SYSLOG -GLOBAL char *ngt_SyslogFacilityName PARAMS((int Facility)); +GLOBAL const char *ngt_SyslogFacilityName PARAMS((int Facility)); GLOBAL int ngt_SyslogFacilityID PARAMS((char *Name, int DefaultFacility)); #endif

1 0

Alexander Barton : Debian packages: build "-full" and "-full-dbg" with support for PAM
by alex＠arthur.barton.de 03 Okt '10

03 Okt '10

Module: ngircd.git Branch: master Commit: c51cc88eb08eb3aa3fd626347bd9c87f2ae7f9c1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c51cc88e… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 3 15:06:07 2010 +0200 Debian packages: build "-full" and "-full-dbg" with support for PAM --- contrib/Debian/rules | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/Debian/rules b/contrib/Debian/rules index 5f6f826..25f4828 100755 --- a/contrib/Debian/rules +++ b/contrib/Debian/rules @@ -53,7 +53,7 @@ configure-ngircd-full: configure --sysconfdir=/etc/ngircd \ --mandir=\$${prefix}/share/man \ --with-syslog --with-zlib \ - --with-gnutls --with-ident --with-tcp-wrappers \ + --with-gnutls --with-ident --with-tcp-wrappers --with-pam \ --enable-ipv6 configure-ngircd-full-dbg: configure @@ -66,7 +66,7 @@ configure-ngircd-full-dbg: configure --mandir=\$${prefix}/share/man \ --enable-debug --enable-sniffer \ --with-syslog --with-zlib \ - --with-gnutls --with-ident --with-tcp-wrappers \ + --with-gnutls --with-ident --with-tcp-wrappers --with-pam \ --enable-ipv6 build:

1 0

Alexander Barton : New functions ngt_SyslogFacilityName() and ngt_SyslogFacilityID()
by alex＠arthur.barton.de 27 Sep '10

27 Sep '10

Module: ngircd.git Branch: master Commit: 4943bbb066bb49603743ae03846689d2f82441b6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4943bbb0… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 24 16:29:55 2010 +0200 New functions ngt_SyslogFacilityName() and ngt_SyslogFacilityID() These both functions translate syslog facility names to ID numbers and vice versa. On systems that don't define the facilitynames[] array in syslog.h, we try to build one ourself. --- src/tool/tool.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- src/tool/tool.h | 7 +++- 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/src/tool/tool.c b/src/tool/tool.c index c973539..fa69ffb 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,11 @@ #include <netinet/in.h> +#ifdef SYSLOG +#define SYSLOG_NAMES 1 +#include <syslog.h> +#endif + #include "exp.h" #include "tool.h" @@ -122,4 +127,92 @@ ngt_TrimLastChr( char *String, const char Chr) } /* ngt_TrimLastChr */ +#ifdef SYSLOG + + +#ifndef INTERNAL_MARK + +#ifndef _code +typedef struct _code { + char *c_name; + int c_val; +} CODE; +#endif + +CODE facilitynames[] = { +#ifdef LOG_AUTH + { "auth", LOG_AUTH }, +#endif +#ifdef LOG_AUTHPRIV + { "authpriv", LOG_AUTHPRIV }, +#endif +#ifdef LOG_CRON + { "cron", LOG_CRON }, +#endif +#ifdef LOG_DAEMON + { "daemon", LOG_DAEMON }, +#endif +#ifdef LOG_FTP + { "ftp", LOG_FTP }, +#endif +#ifdef LOG_LPR + { "lpr", LOG_LPR }, +#endif +#ifdef LOG_MAIL + { "mail", LOG_MAIL }, +#endif +#ifdef LOG_NEWS + { "news", LOG_NEWS }, +#endif +#ifdef LOG_UUCP + { "uucp", LOG_UUCP }, +#endif +#ifdef LOG_USER + { "user", LOG_USER }, +#endif +#ifdef LOG_LOCAL7 + { "local0", LOG_LOCAL0 }, + { "local1", LOG_LOCAL1 }, + { "local2", LOG_LOCAL2 }, + { "local3", LOG_LOCAL3 }, + { "local4", LOG_LOCAL4 }, + { "local5", LOG_LOCAL5 }, + { "local6", LOG_LOCAL6 }, + { "local7", LOG_LOCAL7 }, +#endif + { 0, -1 } +}; + +#endif + + +GLOBAL char +*ngt_SyslogFacilityName(int Facility) +{ + int i = 0; + while(facilitynames[i].c_name) { + if (facilitynames[i].c_val == Facility) + return facilitynames[i].c_name; + i++; + } + return "unknown"; +} + + +GLOBAL int +ngt_SyslogFacilityID(char *Name, int DefaultFacility) +{ + int i = 0; + while(facilitynames[i].c_name) { + if (strcasecmp(facilitynames[i].c_name, Name) == 0) + return facilitynames[i].c_val; + i++; + } + return DefaultFacility; +} + + +#endif + + /* -eof- */ diff --git a/src/tool/tool.h b/src/tool/tool.h index d17e787..ea9e96b 100644 --- a/src/tool/tool.h +++ b/src/tool/tool.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +29,11 @@ GLOBAL void ngt_TrimStr PARAMS((char *String )); GLOBAL char *ngt_UpperStr PARAMS((char *String )); GLOBAL char *ngt_LowerStr PARAMS((char *String )); +#ifdef SYSLOG +GLOBAL char *ngt_SyslogFacilityName PARAMS((int Facility)); +GLOBAL int ngt_SyslogFacilityID PARAMS((char *Name, int DefaultFacility)); +#endif + #endif

1 0

Alexander Barton : New configuration option "SyslogFacility"
by alex＠arthur.barton.de 27 Sep '10

27 Sep '10

Module: ngircd.git Branch: master Commit: 5e82a91d1337b78510bc62fe3c7e43f9c0b7d3d1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5e82a91d… Author: Alexander Barton <alex(a)barton.de> Date: Fri Sep 24 17:39:11 2010 +0200 New configuration option "SyslogFacility" The new option "SyslogFacility" deines the syslog "facility" to which ngIRCd should send log messages. Possible values are system dependant, but most probably "auth", "daemon", "user" and "local1" through "local7" are possible values; see syslog(3). Default is "local5" for historical reasons. --- ChangeLog | 5 +++++ NEWS | 5 +++++ doc/sample-ngircd.conf | 7 +++++++ man/ngircd.conf.5.tmpl | 7 +++++++ src/ngircd/conf.c | 19 +++++++++++++++++++ src/ngircd/conf.h | 7 +++++++ src/ngircd/log.c | 10 ++++------ 7 files changed, 54 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73c8473..4402f06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,11 @@ ngIRCd Release 17 + - New configuration option "SyslogFacility" to define the syslog "facility" + (the "target"), to which ngIRCd should send its log messages. + Possible values are system dependant, but most probably "auth", "daemon", + "user" and "local1" through "local7" are possible values; see syslog(3). + Default is "local5" for historical reasons. - Dump the "internal server state" (configured servers, established connections and known clients) to the console or syslog when receiving the SIGUSR2 signal and debug mode is enabled. diff --git a/NEWS b/NEWS index d3a600c..61e8331 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,11 @@ ngIRCd Release 17 + - New configuration option "SyslogFacility" to define the syslog "facility" + (the "target"), to which ngIRCd should send its log messages. + Possible values are system dependant, but most probably "auth", "daemon", + "user" and "local1" through "local7" are possible values; see syslog(3). + Default is "local5" for historical reasons. - Dump the "internal server state" (configured servers, established connections and known clients) to the console or syslog when receiving the SIGUSR2 signal and debug mode is enabled. diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf index fdeed35..a2694f8 100644 --- a/doc/sample-ngircd.conf +++ b/doc/sample-ngircd.conf @@ -68,6 +68,13 @@ # so the server listens on all IP addresses of the system by default. ;Listen = 127.0.0.1,192.168.0.1 + # Syslog "facility" to which ngIRCd should send log messages. + # Possible values are system dependant, but most probably auth, daemon, + # user and local1 through local7 are possible values; see syslog(3). + # Default is "local5" for historical reasons, you probably want to + # change this to "daemon", for example. + SyslogFacility = local1 + # Text file with the "message of the day" (MOTD). This message will # be shown to all users connecting to the server: ;MotdFile = /usr/local/etc/ngircd.motd diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 71aaa1e..f4f7f6e 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -116,6 +116,13 @@ If unset, the defaults value is "0.0.0.0" or, if ngIRCd was compiled with IPv6 support, "::,0.0.0.0". So the server listens on all configured IP addresses and interfaces by default. .TP +\fBSyslogFacility\fR +Syslog "facility" to which ngIRCd should send log messages. Possible +values are system dependant, but most probably "auth", "daemon", "user" +and "local1" through "local7" are possible values; see syslog(3). +Default is "local5" for historical reasons, you probably want to +change this to "daemon", for example. +.TP \fBMotdFile\fR Text file with the "message of the day" (MOTD). This message will be shown to all users connecting to the server. Changes made to this file diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 5619a6c..acb4010 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -324,6 +324,10 @@ Conf_Test( void ) printf(" ServerGID = %s\n", grp->gr_name); else printf(" ServerGID = %ld\n", (long)Conf_GID); +#ifdef SYSLOG + printf(" SyslogFacility = %s\n", + ngt_SyslogFacilityName(Conf_SyslogFacility)); +#endif printf(" PingTimeout = %d\n", Conf_PingTimeout); printf(" PongTimeout = %d\n", Conf_PongTimeout); printf(" ConnectRetry = %d\n", Conf_ConnectRetry); @@ -600,6 +604,14 @@ Set_Defaults(bool InitServers) Conf_MaxJoins = 10; Conf_MaxNickLength = CLIENT_NICK_LEN_DEFAULT; +#ifdef SYSLOG +#ifdef LOG_LOCAL5 + Conf_SyslogFacility = LOG_LOCAL5; +#else + Conf_SyslogFacility = 0; +#endif +#endif + /* Initialize server configuration structures */ if (InitServers) { for (i = 0; i < MAX_SERVERS; @@ -1148,6 +1160,13 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) return; } #endif +#ifdef SYSLOG + if (strcasecmp(Var, "SyslogFacility") == 0) { + Conf_SyslogFacility = ngt_SyslogFacilityID(Arg, + Conf_SyslogFacility); + return; + } +#endif Config_Error(LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var); } /* Handle_GLOBAL */ diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 5cf5f6b..ff67dc7 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -173,6 +173,13 @@ GLOBAL int Conf_MaxConnectionsIP; /* Maximum length of a nick name */ GLOBAL unsigned int Conf_MaxNickLength; +#ifdef SYSLOG + +/* Syslog "facility" */ +GLOBAL int Conf_SyslogFacility; + +#endif + GLOBAL void Conf_Init PARAMS((void)); GLOBAL bool Conf_Rehash PARAMS((void)); GLOBAL int Conf_Test PARAMS((void)); diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 0cfe3b7..3710142 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -36,6 +36,7 @@ #include "conn.h" #include "channel.h" #include "irc-write.h" +#include "conf.h" #include "exp.h" #include "log.h" @@ -72,13 +73,10 @@ Log_Init( bool Daemon_Mode ) Is_Daemon = Daemon_Mode; #ifdef SYSLOG -#ifndef LOG_CONS /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS/LOG_LOCAL5 */ +#ifndef LOG_CONS /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS */ #define LOG_CONS 0 #endif -#ifndef LOG_LOCAL5 -#define LOG_LOCAL5 0 -#endif - openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 ); + openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); #endif Log( LOG_NOTICE, "%s started.", NGIRCd_Version ); @@ -267,7 +265,7 @@ GLOBAL void Log_Init_Subprocess(char UNUSED *Name) { #ifdef SYSLOG - openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 ); + openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); #endif #ifdef DEBUG Log_Subprocess(LOG_DEBUG, "%s sub-process starting, PID %ld.",

1 0

Alexander Barton : Explicitly cast return value of read(2) to "int"
by alex＠arthur.barton.de 22 Sep '10

22 Sep '10

Module: ngircd.git Branch: master Commit: e2ba7e08b4a4ca73a74c10e7189b46f6d8dcfc75 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e2ba7e08… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 22 14:15:46 2010 +0200 Explicitly cast return value of read(2) to "int" This fixes the following gcc warning, emitted by Xcode: src/ngircd/sighandlers.c: In function 'Signal_Callback': src/ngircd/sighandlers.c:239: warning: implicit conversion shortens 64-bit value into a 32-bit value --- src/ngircd/sighandlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index b8e8013..427789c 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -236,7 +236,7 @@ Signal_Callback(int fd, short UNUSED what) (void) what; do { - ret = read(fd, &sig, sizeof(sig)); + ret = (int)read(fd, &sig, sizeof(sig)); if (ret == sizeof(int)) Signal_Handler_BH(sig); } while (ret == sizeof(int));

1 0

Alexander Barton : Add sighandlers.{c|h} to Xcode project
by alex＠arthur.barton.de 22 Sep '10

22 Sep '10

Module: ngircd.git Branch: master Commit: b1a117cd98bad64ac56f06f854d4b00f488e44ea URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b1a117cd… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 22 14:11:30 2010 +0200 Add sighandlers.{c|h} to Xcode project And update static Mac OS X config.h used by the Xcode project. --- contrib/MacOSX/config.h | 2 ++ contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 72c8875..0da178d 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -97,6 +97,8 @@ #define HAVE_GETADDRINFO 1 /* Define to 1 if you have the `getnameinfo' function. */ #define HAVE_GETNAMEINFO 1 +/* Define to 1 if you have the `sigaction' function. */ +#define HAVE_SIGACTION 1 /* Define if socklen_t exists */ #define HAVE_socklen_t 1 diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index d3a7617..ac3bc6e 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -40,6 +40,7 @@ FA85178C0FA061EC006A1F5A /* op.c in Sources */ = {isa = PBXBuildFile; fileRef = FA85178B0FA061EC006A1F5A /* op.c */; }; FA99428C10E82A27007F27ED /* proc.c in Sources */ = {isa = PBXBuildFile; fileRef = FA99428B10E82A27007F27ED /* proc.c */; }; FAA3D27B0F139CDC00B2447E /* conn-ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA3D2790F139CDC00B2447E /* conn-ssl.c */; }; + FAA97C57124A271400D5BBA9 /* sighandlers.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA97C55124A271400D5BBA9 /* sighandlers.c */; }; FAE5CC2E0CF2308A007D69B6 /* numeric.c in Sources */ = {isa = PBXBuildFile; fileRef = FAE5CC2D0CF2308A007D69B6 /* numeric.c */; }; /* End PBXBuildFile section */ @@ -226,6 +227,8 @@ FAA3D2880F139D2E00B2447E /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; }; FAA3D28A0F139D2E00B2447E /* postinstall.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = postinstall.sh; sourceTree = "<group>"; }; FAA3D28B0F139D2E00B2447E /* preinstall.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = preinstall.sh; sourceTree = "<group>"; }; + FAA97C55124A271400D5BBA9 /* sighandlers.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = sighandlers.c; sourceTree = "<group>"; }; + FAA97C56124A271400D5BBA9 /* sighandlers.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = sighandlers.h; sourceTree = "<group>"; }; FAE5CC2C0CF2308A007D69B6 /* numeric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = numeric.h; sourceTree = "<group>"; }; FAE5CC2D0CF2308A007D69B6 /* numeric.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = numeric.c; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -355,6 +358,8 @@ FA322D0B0CEF74B1001761B3 /* rendezvous.h */, FA322D0C0CEF74B1001761B3 /* resolve.c */, FA322D0D0CEF74B1001761B3 /* resolve.h */, + FAA97C55124A271400D5BBA9 /* sighandlers.c */, + FAA97C56124A271400D5BBA9 /* sighandlers.h */, FA2D564811EA158B00D37A35 /* pam.h */, FA2D564911EA158B00D37A35 /* pam.c */, ); @@ -698,6 +703,7 @@ FA85178C0FA061EC006A1F5A /* op.c in Sources */, FA99428C10E82A27007F27ED /* proc.c in Sources */, FA2D564A11EA158B00D37A35 /* pam.c in Sources */, + FAA97C57124A271400D5BBA9 /* sighandlers.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };

1 0

Alexander Barton : Don't call sigaction() if it is not available on the system
by alex＠arthur.barton.de 22 Sep '10

22 Sep '10

Module: ngircd.git Branch: master Commit: 4a770e8e2deaa90bd99edd8132de09f778158a87 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a770e8e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 22 14:10:09 2010 +0200 Don't call sigaction() if it is not available on the system --- src/ngircd/sighandlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index 80eef3e..b8e8013 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -326,7 +326,7 @@ Signals_Exit(void) sigaction(SIGPIPE, &saction, NULL); #else for (i=0; i < C_ARRAY_SIZE(signals_catch) ; i++) - sigaction(signals_catch[i], &saction, NULL); + signal(signals_catch[i], SIG_DFL); signal(SIGPIPE, SIG_DFL); #endif close(signalpipe[1]);

1 0

Florian Westphal : Fix signalpipe file descriptor leak on RESTART
by fw＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: ba720fcbaeaacee700d7d23936cf481e6fcb83b1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ba720fcb… Author: Florian Westphal <fw(a)strlen.de> Date: Tue Sep 14 23:53:59 2010 +0200 Fix signalpipe file descriptor leak on RESTART Signals_Init() must only be called once. This does not affect any ngircd release version. Earlier version of this patch moved the io and sighandler initialization before the while() loop, but as Alexander Barton noticed that broke all systems without builtin select support in io.c... --- src/ngircd/sighandlers.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index aaff1ea..80eef3e 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -266,6 +266,8 @@ Signals_Init(void) #ifdef HAVE_SIGACTION struct sigaction saction; #endif + if (signalpipe[0] > 0 || signalpipe[1] > 0) + return true; if (pipe(signalpipe)) return false;

1 0

Florian Westphal : Fix signalpipe file descriptor leak on RESTART
by fw＠arthur.barton.de 14 Sep '10

14 Sep '10

Module: ngircd.git Branch: master Commit: 3beb2880396722f79becaf3da9c6b034fb57e1c3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3beb2880… Author: Florian Westphal <fw(a)strlen.de> Date: Tue Sep 14 23:36:33 2010 +0200 Fix signalpipe file descriptor leak on RESTART Signals_Init() must only be called once. This does not affect any ngircd release version. --- src/ngircd/ngircd.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index d4d4d5f..0d0a757 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -255,7 +255,17 @@ main( int argc, const char *argv[] ) Show_Version( ); puts( "" ); exit( Conf_Test( )); } - + + if (!io_library_init(CONNECTION_POOL)) { + Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno)); + exit(1); + } + + if (!Signals_Init()) { + Log(LOG_ALERT, "Fatal: Could not set up signal handlers: %s", strerror(errno)); + exit(1); + } + while( ! NGIRCd_SignalQuit ) { /* Initialize global variables */ @@ -290,15 +300,6 @@ main( int argc, const char *argv[] ) * when not running in "no daemon" mode: */ if( ! NGIRCd_NoDaemon ) Log_InitErrorfile( ); #endif - if (!io_library_init(CONNECTION_POOL)) { - Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno)); - exit(1); - } - - if (!Signals_Init()) { - Log(LOG_ALERT, "Fatal: Could not set up signal handlers: %s", strerror(errno)); - exit(1); - } /* * create protocol and server identification.

1 0