- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Use srand()/rand() instead of srandom()/random(); seems to be more portable
by alex＠arthur.barton.de 26 Jun '11

26 Jun '11

Module: ngircd.git Branch: master Commit: 7f8d0ea5a3e927b8b6dd84eae63849ae17cdf5ae URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7f8d0ea5… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jun 26 23:39:20 2011 +0200 Use srand()/rand() instead of srandom()/random(); seems to be more portable --- src/ngircd/irc-login.c | 2 +- src/ngircd/ngircd.c | 6 +++--- src/ngircd/proc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 2e99d66..067703a 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -273,7 +273,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) #ifndef STRICT_RFC if (Conf_AuthPing) { - Conn_SetAuthPing(Client_Conn(Client), random()); + Conn_SetAuthPing(Client_Conn(Client), rand()); IRC_WriteStrClient(Client, "PING :%ld", Conn_GetAuthPing(Client_Conn(Client))); LogDebug("Connection %d: sent AUTH PING %ld ...", diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 58383cf..500d128 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -576,13 +576,13 @@ Random_Init_Kern(const char *file) if (read(fd, &seed, sizeof(seed)) == sizeof(seed)) ret = true; close(fd); - srandom(seed); + srand(seed); } return ret; } /** - * Initialize libc random(3) number generator + * Initialize libc rand(3) number generator */ static void Random_Init(void) @@ -593,7 +593,7 @@ Random_Init(void) return; if (Random_Init_Kern("/dev/arandom")) return; - srandom(random() ^ getpid() ^ time(NULL)); + srand(rand() ^ getpid() ^ time(NULL)); } diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index 217eb6d..54b3919 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.c @@ -62,7 +62,7 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; } - seed = (unsigned int)random(); + seed = (unsigned int)rand(); pid = fork(); switch (pid) { case -1: @@ -73,7 +73,7 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; case 0: /* New child process: */ - srandom(seed ^ (unsigned int)time(NULL) ^ getpid()); + srand(seed ^ (unsigned int)time(NULL) ^ getpid()); Signals_Exit(); signal(SIGTERM, Proc_GenericSignalHandler); signal(SIGALRM, Proc_GenericSignalHandler);

1 0

Alexander Barton : sample-ngircd.conf: remove "SSL" prefix from SSL-related variables
by alex＠arthur.barton.de 26 Jun '11

26 Jun '11

Module: ngircd.git Branch: master Commit: cb28c4ff03d775825b698fcff3fbe68b50a8f8a6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cb28c4ff… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jun 26 15:39:39 2011 +0200 sample-ngircd.conf: remove "SSL" prefix from SSL-related variables --- doc/sample-ngircd.conf.tmpl | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 900e695..fc903cd 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -187,19 +187,19 @@ # So don't forget to remove the ";" above if this is the case ... # SSL Server Key Certificate - ;SSLCertFile = :ETCDIR:/ssl/server-cert.pem + ;CertFile = :ETCDIR:/ssl/server-cert.pem # Diffie-Hellman parameters - ;SSLDHFile = :ETCDIR:/ssl/dhparams.pem + ;DHFile = :ETCDIR:/ssl/dhparams.pem # SSL Server Key - ;SSLKeyFile = :ETCDIR:/ssl/server-key.pem + ;KeyFile = :ETCDIR:/ssl/server-key.pem # password to decrypt SSLKeyFile (OpenSSL only) - ;SSLKeyFilePassword = secret + ;KeyFilePassword = secret # Additional Listen Ports that expect SSL/TLS encrypted connections - ;SSLPorts = 6697, 9999 + ;Ports = 6697, 9999 [Operator] # [Operator] sections are used to define IRC Operators. There may be

1 0

Alexander Barton : Merge branch 'MorePrivacy'
by alex＠arthur.barton.de 26 Jun '11

26 Jun '11

Module: ngircd.git Branch: master Commit: d99edb7728e058a889e4734f8592f495effa5bc3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d99edb77… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jun 26 15:41:27 2011 +0200 Merge branch 'MorePrivacy' * MorePrivacy: New configuration opion "MorePrivacy" to "censor" some user information ---

1 0

Alexander Barton : PAM: make clear which "Password" config option is ignored
by alex＠arthur.barton.de 26 Jun '11

26 Jun '11

Module: ngircd.git Branch: master Commit: 449ad1eeea20b08d2fe049725f71e98e105ec5f4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=449ad1ee… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 25 23:55:54 2011 +0200 PAM: make clear which "Password" config option is ignored --- src/ngircd/conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 9e3fe13..f5ddec8 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1842,7 +1842,7 @@ Validate_Config(bool Configtest, bool Rehash) #ifdef PAM if (Conf_ServerPwd[0]) Config_Error(LOG_ERR, - "This server uses PAM, \"Password\" will be ignored!"); + "This server uses PAM, \"Password\" in [Global] section will be ignored!"); #endif #ifdef DEBUG

1 0

Alexander Barton : CheckFileReadable(): only check when a filename is given ...
by alex＠arthur.barton.de 26 Jun '11

26 Jun '11

Module: ngircd.git Branch: master Commit: a085444035016061ca71d43f077d715138708f4e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a0854440… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jun 26 00:07:47 2011 +0200 CheckFileReadable(): only check when a filename is given ... --- src/ngircd/conf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index f5ddec8..0a814a7 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -121,6 +121,9 @@ CheckFileReadable(const char *Var, const char *Filename) { FILE *fp; + if (!Filename) + return; + fp = fopen(Filename, "r"); if (fp) fclose(fp);

1 0

Alexander Barton : Move SSL-related configuration variables to new [SSL] section
by alex＠arthur.barton.de 26 Jun '11

26 Jun '11

Module: ngircd.git Branch: master Commit: 946d838de4b6aee588e1136dcea018259a17e778 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=946d838d… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jun 26 00:09:36 2011 +0200 Move SSL-related configuration variables to new [SSL] section --- INSTALL | 14 ++-- doc/sample-ngircd.conf.tmpl | 32 ++++++---- man/ngircd.conf.5.tmpl | 41 ++++++++----- src/ngircd/conf.c | 137 ++++++++++++++++++++++++++++--------------- 4 files changed, 140 insertions(+), 84 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=946d…

1 0

Alexander Barton : sample-ngircd.conf: "SyslogFacility" should be commented out
by alex＠arthur.barton.de 26 Jun '11

26 Jun '11

Module: ngircd.git Branch: master Commit: 3d0ce77f12117df9e12d364c725c3c54332901bd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3d0ce77f… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jun 26 00:10:22 2011 +0200 sample-ngircd.conf: "SyslogFacility" should be commented out --- doc/sample-ngircd.conf.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 4079724..0f2e7ee 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -171,7 +171,7 @@ # 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 + ;SyslogFacility = local1 # Password required for using the WEBIRC command used by some # Web-to-IRC gateways. If not set/empty, the WEBIRC command can't

1 0

Alexander Barton : Merge branch 'newconfig'
by alex＠arthur.barton.de 26 Jun '11

26 Jun '11

Module: ngircd.git Branch: master Commit: 3282c1325e491f2fbc7ee388c557f40e1f9eaed6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3282c132… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jun 26 15:24:07 2011 +0200 Merge branch 'newconfig' * newconfig: sample-ngircd.conf: "SyslogFacility" should be commented out Move SSL-related configuration variables to new [SSL] section CheckFileReadable(): only check when a filename is given ... PAM: make clear which "Password" config option is ignored Really remove [Features] in our manual pages INSTALL: document changed location of configuration variables Update sample config file and manual page for new config structure Testsuite: update configuration files for new config file format Display configuration errors more prominent on "--configtest" conf.c: code cleanup Check for redability of SSL-related files like for MOTD file Restructure ngIRCd configuration, introduce [Limits] and [Options] ---

1 0

Alexander Barton : Merge branch 'ScrubCTCP'
by alex＠arthur.barton.de 26 Jun '11

26 Jun '11

Module: ngircd.git Branch: master Commit: 269310f04b7624675f0e609a18c645474d9e5c6f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=269310f0… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jun 26 15:38:53 2011 +0200 Merge branch 'ScrubCTCP' * ScrubCTCP: Add documentation for "ScrubCTCP" configuration option New option to scrub incoming CTCP commands ---

1 0

Alexander Barton : conf.c: code cleanup
by alex＠arthur.barton.de 26 Jun '11

26 Jun '11

Module: ngircd.git Branch: master Commit: 391cf4e2a11a1ca3969cb01db062037a9cd8caf3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=391cf4e2… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jun 25 14:55:34 2011 +0200 conf.c: code cleanup --- src/ngircd/conf.c | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index b79715d..4da5b9e 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -302,12 +302,11 @@ Conf_Test( void ) config_valid = Validate_Config(true, false); /* Valid tty? */ - if( isatty( fileno( stdin )) && isatty( fileno( stdout ))) { - puts( "OK, press enter to see a dump of your service configuration ..." ); - getchar( ); - } else { - puts( "Ok, dump of your server configuration follows:\n" ); - } + if(isatty(fileno(stdin)) && isatty(fileno(stdout))) { + puts("OK, press enter to see a dump of your server configuration ..."); + getchar(); + } else + puts("Ok, dump of your server configuration follows:\n"); puts("[GLOBAL]"); printf(" Name = %s\n", Conf_ServerName); @@ -881,7 +880,9 @@ Read_Config( bool ngircd_starting ) continue; } - Config_Error( LOG_ERR, "%s, line %d: Unknown section \"%s\"!", NGIRCd_ConfFile, line, section ); + Config_Error(LOG_ERR, + "%s, line %d: Unknown section \"%s\"!", + NGIRCd_ConfFile, line, section); section[0] = 0x1; } if( section[0] == 0x1 ) continue; @@ -1050,8 +1051,8 @@ WarnPAM(int UNUSED Line) /** * Handle legacy "NoXXX" options in [GLOBAL] section. * - * TODO: This function and support for "NoXXX" should be removed starting - * with ngIRCd release 19! (One release after marking it "deprecated"). + * TODO: This function and support for "NoXXX" could be removed starting + * with ngIRCd release 19 (one release after marking it "deprecated"). * * @param Var Variable name. * @param Arg Argument string. @@ -1060,7 +1061,7 @@ WarnPAM(int UNUSED Line) static bool CheckLegacyNoOption(const char *Var, const char *Arg) { - if( strcasecmp( Var, "NoDNS" ) == 0 ) { + if(strcasecmp(Var, "NoDNS") == 0) { Conf_DNS = !Check_ArgIsTrue( Arg ); return true; } @@ -1168,9 +1169,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) size_t len; const char *section; - assert( Line > 0 ); - assert( Var != NULL ); - assert( Arg != NULL ); + assert(Line > 0); + assert(Var != NULL); + assert(Arg != NULL); if (strcasecmp(Var, "Name") == 0) { len = strlcpy(Conf_ServerName, Arg, sizeof(Conf_ServerName)); @@ -1232,12 +1233,13 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) if (len == 0) return; if (len >= LINE_LEN) { - Config_Error_TooLong( Line, Var ); + Config_Error_TooLong(Line, Var); return; } if (!array_copyb(&Conf_Motd, Arg, len + 1)) - Config_Error(LOG_WARNING, "%s, line %d: Could not append MotdPhrase: %s", - NGIRCd_ConfFile, Line, strerror(errno)); + Config_Error(LOG_WARNING, + "%s, line %d: Could not append MotdPhrase: %s", + NGIRCd_ConfFile, Line, strerror(errno)); Using_MotdFile = false; return; } @@ -1281,8 +1283,12 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) } if (CheckLegacyNoOption(Var, Arg)) { - Config_Error(LOG_WARNING, "%s, line %d: \"No\"-Prefix has been removed, use \"%s = %s\" in [FEATURES] section instead", - NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg)); + /* TODO: This function and support for "NoXXX" could be + * be removed starting with ngIRCd release 19 (one release + * after marking it "deprecated"). */ + Config_Error(LOG_WARNING, + "%s, line %d (section \"Global\"): \"No\"-Prefix is deprecated, use \"%s = %s\" in [Options] section!", + NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg)); if (strcasecmp(Var, "NoIdent") == 0) WarnIdent(Line); else if (strcasecmp(Var, "NoPam") == 0)

1 0