- ngIRCd GIT Updates - lists.barton.de

Federico G. Schwindt : Add support for arc4random
by alex＠arthur.barton.de 16 Okt '13

16 Okt '13

Module: ngircd.git Branch: master Commit: 17589534d0ccff05463910d1f0ba673d7d1630fd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=17589534… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Wed Oct 16 11:15:27 2013 +0100 Add support for arc4random If arc4random is present it will be used over the srand/rand interface. This fixes some warnings in OpenBSD-current. --- configure.ng | 5 +++-- src/ngircd/conf.c | 4 ++++ src/ngircd/irc-login.c | 4 ++++ src/ngircd/ngircd.c | 8 ++++++++ src/ngircd/proc.c | 6 ++++++ src/tool/tool.c | 5 +++++ 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/configure.ng b/configure.ng index faf3086..16f970f 100644 --- a/configure.ng +++ b/configure.ng @@ -187,8 +187,9 @@ AC_CHECK_FUNCS([ \ # Optional functions AC_CHECK_FUNCS_ONCE([ \ - gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \ - snprintf vsnprintf strdup strndup strlcpy strlcat strtok_r waitpid]) + arc4random gai_strerror getaddrinfo getnameinfo inet_aton sigaction \ + sigprocmask snprintf vsnprintf strdup strndup strlcpy strlcat strtok_r \ + waitpid]) # -- Configuration options -- diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 9c2c912..d337947 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -533,7 +533,11 @@ Conf_UnsetServer( CONN_ID Idx ) /* "Short" connection, enforce "ConnectRetry" * but randomize it a little bit: 15 seconds. */ Conf_Server[i].lasttry = +#ifdef HAVE_ARC4RANDOM + t + (arc4random() % 15); +#else t + rand() / (RAND_MAX / 15); +#endif } } } diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index af087f9..d1b4033 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -242,7 +242,11 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) #ifndef STRICT_RFC if (Conf_AuthPing) { +#ifdef HAVE_ARC4RANDOM + Conn_SetAuthPing(Client_Conn(Client), arc4random()); +#else Conn_SetAuthPing(Client_Conn(Client), rand()); +#endif 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 6af5816..da53705 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -613,6 +613,13 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) #endif +#ifdef HAVE_ARC4RANDOM +static void +Random_Init(void) +{ + +} +#else static bool Random_Init_Kern(const char *file) { @@ -642,6 +649,7 @@ Random_Init(void) return; srand(rand() ^ (unsigned)getpid() ^ (unsigned)time(NULL)); } +#endif /** diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index e062cd0..d290f3b 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.c @@ -50,7 +50,9 @@ GLOBAL pid_t Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout) { pid_t pid; +#ifndef HAVE_ARC4RANDOM unsigned int seed; +#endif assert(proc != NULL); assert(pipefds != NULL); @@ -62,7 +64,9 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; } +#ifndef HAVE_ARC4RANDOM seed = (unsigned int)rand(); +#endif pid = fork(); switch (pid) { case -1: @@ -73,7 +77,9 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; case 0: /* New child process: */ +#ifndef HAVE_ARC4RANDOM srand(seed ^ (unsigned int)time(NULL) ^ getpid()); +#endif Signals_Exit(); signal(SIGTERM, Proc_GenericSignalHandler); signal(SIGALRM, Proc_GenericSignalHandler); diff --git a/src/tool/tool.c b/src/tool/tool.c index 1bb3ebe..3b9cc25 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -144,11 +144,16 @@ ngt_RandomStr(char *String, const size_t len) assert(String != NULL); gettimeofday(&t, NULL); +#ifndef HAVE_ARC4RANDOM srand((unsigned)(t.tv_usec * t.tv_sec)); for (i = 0; i < len; ++i) { String[i] = chars[rand() % (sizeof(chars) - 1)]; } +#else + for (i = 0; i < len; ++i) + String[i] = chars[arc4random() % (sizeof(chars) - 1)]; +#endif String[len] = '\0'; return String;

1 0

Federico G. Schwindt : Fix another strcat warning missed in commit 4c5b43
by alex＠arthur.barton.de 16 Okt '13

16 Okt '13

Module: ngircd.git Branch: master Commit: ea26fd2840f6c7f286407e86f832d6ec5e93eeeb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ea26fd28… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Wed Oct 16 10:40:14 2013 +0100 Fix another strcat warning missed in commit 4c5b43 --- src/ngircd/ngircd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 9c27409..6af5816 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -300,7 +300,7 @@ main(int argc, const char *argv[]) strlcat(NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID); #endif if (Conf_OperCanMode) - strcat(NGIRCd_ProtoID, "o"); + strlcat(NGIRCd_ProtoID, "o", sizeof NGIRCd_ProtoID); #else /* IRCPLUS */ snprintf(NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION);

1 0

Alexander Barton : platformtest.sh: Detect Apple LLVM (clang) compiler
by alex＠arthur.barton.de 14 Okt '13

14 Okt '13

Module: ngircd.git Branch: master Commit: 0bd3fb88b2c2a433a68c82c3eaba2fd13b8fcd0b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0bd3fb88… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 14 23:45:59 2013 +0200 platformtest.sh: Detect Apple LLVM (clang) compiler --- contrib/platformtest.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index cfa1ecc..765fb39 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors +# Copyright (c)2001-2013 Alexander Barton (alex(a)barton.de) and Contributors # # 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 @@ -108,12 +108,16 @@ if [ -r "Makefile" ]; then COMPILER="gcc $COMPILER" fi else - case "$CC" in - gcc*) + $CC --version 2>&1 | grep -i "LLVM" >/dev/null + if [ $? -eq 0 ]; then + COMPILER=$($CC --version 2>/dev/null | head -1 \ + | cut -d'(' -f1 | sed -e 's/version //g' \ + | sed -e 's/Apple /A-/g') + fi + if [ "$COMPILER" = "unknown" ]; then v="`$CC --version 2>/dev/null | head -1`" - [ -n "$v" ] && COMPILER="gcc $v" - ;; - esac + [ -n "$v" ] && COMPILER="$v" + fi fi fi

1 0

Alexander Barton : platformtest.sh: Clean up GIT source tree, when possible
by alex＠arthur.barton.de 14 Okt '13

14 Okt '13

Module: ngircd.git Branch: master Commit: 45d3e6aa91295bee056df8be5c3ed224420fba02 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=45d3e6aa… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 14 23:47:07 2013 +0200 platformtest.sh: Clean up GIT source tree, when possible --- contrib/platformtest.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index 765fb39..ac54575 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -54,6 +54,16 @@ if [ $? -ne 0 ]; then cd .. fi +echo "$NAME: Checking for GIT tree ..." +if [ -d .git ]; then + echo "$NAME: Checking for \"git\" command ..." + git version >/dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "$NAME: Running \"git clean\" ..." + [ -n "$VERBOSE" ] && git clean -dxf || git clean -dxf >/dev/null + fi +fi + echo "$NAME: Checking for \"./configure\" script ..." if [ ! -e ./configure ]; then echo "$NAME: Running \"./autogen.sh\" ..."

1 0

Alexander Barton : Update (date of) manual pages
by alex＠arthur.barton.de 07 Okt '13

07 Okt '13

Module: ngircd.git Branch: master Commit: c34b91d8ddd23c0f04da949b4f3b592ed081c729 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c34b91d8… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 7 23:02:27 2013 +0200 Update (date of) manual pages --- man/ngircd.8.tmpl | 2 +- man/ngircd.conf.5.tmpl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/ngircd.8.tmpl b/man/ngircd.8.tmpl index d56dc87..524fe3c 100644 --- a/man/ngircd.8.tmpl +++ b/man/ngircd.8.tmpl @@ -1,7 +1,7 @@ .\" .\" ngircd(8) manual page template .\" -.TH ngircd 8 "Jul 2013" ngIRCd "ngIRCd Manual" +.TH ngircd 8 "Oct 2013" ngIRCd "ngIRCd Manual" .SH NAME ngIRCd \- the "next generation" IRC daemon .SH SYNOPSIS diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index b69649e..5ca6ee3 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -1,7 +1,7 @@ .\" .\" ngircd.conf(5) manual page template .\" -.TH ngircd.conf 5 "May 2013" ngIRCd "ngIRCd Manual" +.TH ngircd.conf 5 "Oct 2013" ngIRCd "ngIRCd Manual" .SH NAME ngircd.conf \- configuration file of ngIRCd .SH SYNOPSIS @@ -133,8 +133,8 @@ if ngIRCd is using PAM! .TP \fBPidFile\fR (string) This tells ngIRCd to write its current process ID to a file. Note that the -pidfile is written AFTER chroot and switching the user ID, e.g. the directory -the pidfile resides in must be writable by the ngIRCd user and exist in the +"PID file" is written AFTER chroot and switching the user ID, e.g. the directory +the file resides in must be writable by the ngIRCd user and exist in the chroot directory (if configured, see above). .TP \fBPorts\fR (list of numbers)

1 0

Alexander Barton : ChnageLog file: even more spelling fixes ...
by alex＠arthur.barton.de 07 Okt '13

07 Okt '13

Module: ngircd.git Branch: master Commit: 56da86b4f4f162851f802d9e90b2779d804f411b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=56da86b4… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 7 22:17:49 2013 +0200 ChnageLog file: even more spelling fixes ... --- ChangeLog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7433ff0..ce17367 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,10 +18,10 @@ ngIRCd 21~rc1 (2013-10-05) unnecessary duplicates. - Add support to show all user links using the "STATS L" (uppercase) command (restricted to IRC Operators). - - Fixed blocking of server reconnects in some error confitions. + - Fixed blocking of server reconnects in some error configurations. - Don't ignore SSL-related errors during startup any more: abort startup when SSL is requested by the configuration but can't be initialized and - don't continue only listening on plain text communicaiton ports. + don't continue only listening on plain text communication ports. (Closes bug #163) - Implement configurable SSL cipher list selection for GnuTLS and OpenSSL using the new configuration option "CipherList". In addition, this @@ -31,8 +31,8 @@ ngIRCd 21~rc1 (2013-10-05) is "syntax error") when there are too many parameters. - Clean up lots of permission and parameter checks in functions handling IRC commands; and more consistently add penalty times on errors. - - Fix error numeric of WHOIS when no nick namename has been provided: - as per RFC it shoud be ERR_NONICKNAMEGIVEN(431). + - Fix error numeric of WHOIS when no nick name has been provided: + as per RFC it should be ERR_NONICKNAMEGIVEN(431). - Only log "IDENT ... no result" messages when an IDENT looked took place and didn't return any data, not when IDENT has been disabled. - Show connection flag "s" (SSL) in RPL_TRACE{LINK|SERVER} messages: now @@ -87,7 +87,7 @@ ngIRCd 21~rc1 (2013-10-05) - OS X PackageMaker: use relative path names in project files and package with correct file permissions (requires root privileges on "make"). - Add Travis-CI configuration file (".travis.yml") to project. - - Look for possible cloaked Masks in Lists. Users with +x usermode can + - Look for possible cloaked Masks in Lists. Users with +x user mode can be banned with their cloaked hostname now. - Don't read SSL client data before DNS resolver is finished which could have resulted in discarding the resolved client hostname and IDENT

1 0

Alexander Barton : INSTALL file: Update "Upgrade Information"
by alex＠arthur.barton.de 07 Okt '13

07 Okt '13

Module: ngircd.git Branch: master Commit: ea8a2bf1fc786874010c8a6ef84b3142c536112e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ea8a2bf1… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 7 22:15:22 2013 +0200 INSTALL file: Update "Upgrade Information" --- INSTALL | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index eec2b37..bbff1f2 100644 --- a/INSTALL +++ b/INSTALL @@ -12,13 +12,17 @@ I. Upgrade Information ~~~~~~~~~~~~~~~~~~~~~~ -Differences to previous version +Differences to version 20.x - Starting with ngIRCd 21, the ciphers used by SSL are configurable and default to HIGH:!aNULL:@STRENGTH (OpenSSL) or SECURE128 (GnuTLS). Previous version were using the OpenSSL or GnuTLS defaults, DEFAULT and NORMAL respectively. +- When adding GLINE's or KLINE's to ngIRCd 21 (or newer), all clients matching + the new mask will be KILL'ed. This was not the case with earlier versions + that only added the mask but didn't kill already connected users. + Differences to version 19.x - Starting with ngIRCd 20, users can "cloak" their hostname only when the

1 0

Alexander Barton : Fix spelling in NEWS and ChangeLog files
by alex＠arthur.barton.de 07 Okt '13

07 Okt '13

Module: ngircd.git Branch: master Commit: 1b349b05d5040de19921f087785310dfe24ef5df URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1b349b05… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 7 21:59:02 2013 +0200 Fix spelling in NEWS and ChangeLog files --- ChangeLog | 4 ++-- NEWS | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbf5d2c..7433ff0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,7 +59,7 @@ ngIRCd 21~rc1 (2013-10-05) If set to the empty string, local clients can't create new channels at all, which equals the old "PredefChannelsOnly = yes" setting. This change deprecates the "PredefChannelsOnly" variable, too, but it is - still supported and translated to the apropriate "AllowedChannelTypes" + still supported and translated to the appropriate "AllowedChannelTypes" setting. When the old "PredefChannelsOnly" variable is processed, a warning message is logged. (Closes bug #152) - Add support for "client certificate fingerprinting". When a client @@ -125,7 +125,7 @@ ngIRCd 21~rc1 (2013-10-05) InspIRCd, for example -- but as usual, other numerics are in use, too, like 613 in UltimateIRCd ... Please note that neither the Operator (+o) not the "bot status" (+B) - of an IRC service id displayed in the output. + of an IRC service is displayed in the output. - Exit message: use singular & plural :-) - autogen.sh: Check for autoconf/automake wrapper scripts - Add missing punctuation marks in log messages, adjust some severity diff --git a/NEWS b/NEWS index e8f898a..785ce03 100644 --- a/NEWS +++ b/NEWS @@ -36,7 +36,7 @@ ngIRCd 21~rc1 (2013-10-05) If set to the empty string, local clients can't create new channels at all, which equals the old "PredefChannelsOnly = yes" setting. This change deprecates the "PredefChannelsOnly" variable, too, but it is - still supported and translated to the apropriate "AllowedChannelTypes" + still supported and translated to the appropriate "AllowedChannelTypes" setting. When the old "PredefChannelsOnly" variable is processed, a warning message is logged. (Closes bug #152) - Add support for "client certificate fingerprinting". When a client @@ -72,7 +72,7 @@ ngIRCd 21~rc1 (2013-10-05) InspIRCd, for example -- but as usual, other numerics are in use, too, like 613 in UltimateIRCd ... Please note that neither the Operator (+o) not the "bot status" (+B) - of an IRC service id displayed in the output. + of an IRC service is displayed in the output. - Update systemd(8) example configuration files in ./contrib/ directory: the "ngircd.service" file now uses the "forking" service type which enhances the log messages shown by "systemctl status ngircd.service",

1 0

Alexander Barton : ngircd.c, main(): use strlcat() instead of strcat()
by alex＠arthur.barton.de 07 Okt '13

07 Okt '13

Module: ngircd.git Branch: master Commit: 4c5b439992ce99f1bed84c51e4d9c3a3cd118858 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4c5b4399… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 7 21:56:09 2013 +0200 ngircd.c, main(): use strlcat() instead of strcat() This fixes the following warning on OpenBSD 5.3: ngircd.o(.text+0xeb4): In function `main': src/ngircd/ngircd.c:300: warning: strcat() is almost always misused, please use strlcat() Thanks to Götz Hoffart for reporting this! --- src/ngircd/ngircd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 5637cb2..9c27409 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -297,7 +297,7 @@ main(int argc, const char *argv[]) PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS); #ifdef ZLIB - strcat(NGIRCd_ProtoID, "Z"); + strlcat(NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID); #endif if (Conf_OperCanMode) strcat(NGIRCd_ProtoID, "o");

1 0

Tag rel-21-rc1: Alexander Barton : ngIRCd Release 21~rc1
by alex＠arthur.barton.de 05 Okt '13

05 Okt '13

Module: ngircd.git Branch: refs/tags/rel-21-rc1 Tag: e1de5e4ec63ae2b674775c78482cafdd1be00c4c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=e1de5e4ec63… Tagger: Alexander Barton <alex(a)barton.de> Date: Sat Oct 5 23:40:43 2013 +0200 ngIRCd Release 21~rc1

1 0