- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Define HAVE_SETSID for Mac OS X Xcode builds
by alex＠arthur.barton.de 06 Okt '12

06 Okt '12

Module: ngircd.git Branch: master Commit: 4790d78c980c79abfd71c064be1eb085717210f8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4790d78c… Author: Alexander Barton <alex(a)barton.de> Date: Sat Oct 6 17:58:44 2012 +0200 Define HAVE_SETSID for Mac OS X Xcode builds --- contrib/MacOSX/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 5b47e9d..5a71278 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -98,6 +98,8 @@ #define HAVE_GETNAMEINFO 1 /* Define to 1 if you have the `sigaction' function. */ #define HAVE_SIGACTION 1 +/* Define to 1 if you have the `setsid' function. */ +#define HAVE_SETSID 1 /* Define if socklen_t exists */ #define HAVE_socklen_t 1

1 0

Alexander Barton : Fix spelling: ERR_CHANOPPRIVTOLOW_MSG -> ERR_CHANOPPRIVTOOLOW_MSG
by alex＠arthur.barton.de 06 Okt '12

06 Okt '12

Module: ngircd.git Branch: master Commit: c66e20ce6e1b6fd333fc6fe13953178547470c44 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c66e20ce… Author: Alexander Barton <alex(a)barton.de> Date: Sat Oct 6 17:21:32 2012 +0200 Fix spelling: ERR_CHANOPPRIVTOLOW_MSG -> ERR_CHANOPPRIVTOOLOW_MSG Thanks to DNS for pointing this out, see bug #126! --- src/ngircd/channel.c | 2 +- src/ngircd/messages.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 59fe002..10b0540 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -364,7 +364,7 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, } if(!can_kick) { - IRC_WriteStrClient(Origin, ERR_CHANOPPRIVTOLOW_MSG, + IRC_WriteStrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG, Client_ID(Origin), Name); return; } diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index b40f0fc..efc7524 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -139,7 +139,7 @@ #define ERR_LISTFULL_MSG "478 %s %s %s: Channel list is full (%d)" #define ERR_NOPRIVILEGES_MSG "481 %s :Permission denied" #define ERR_CHANOPRIVSNEEDED_MSG "482 %s %s :You are not channel operator" -#define ERR_CHANOPPRIVTOLOW_MSG "482 %s %s :Your privileges are to low" +#define ERR_CHANOPPRIVTOOLOW_MSG "482 %s %s :Your privileges are too low" #define ERR_CANTKILLSERVER_MSG "483 %s :You can't kill a server!" #define ERR_RESTRICTED_MSG "484 %s :Your connection is restricted" #define ERR_NICKREGISTER_MSG "484 %s :Cannot modify user mode (+R) -- Use IRC services"

1 0

Alexander Barton : Makefile.am: don't use "make -C", it isn't portable
by alex＠arthur.barton.de 27 Sep '12

27 Sep '12

Module: ngircd.git Branch: master Commit: 114644cdb0a54804e4f68818235cc2d99b90322c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=114644cd… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 27 01:11:01 2012 +0200 Makefile.am: don't use "make -C", it isn't portable --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 43b37e7..f6a97ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,13 +26,13 @@ maintainer-clean-local: rm -f config.log debian testsuite: - make -C src/testsuite check + cd src/testsuite && make check lint: - make -C src/ngircd lint + cd src/ngircd && make lint srcdoc: - make -C doc srcdoc + cd doc && make srcdoc have-xcodebuild: @xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \

1 0

Alexander Barton : Test suite: don't use "mkdir -p"
by alex＠arthur.barton.de 27 Sep '12

27 Sep '12

Module: ngircd.git Branch: master Commit: cf9f9e1f30857d615fed9b83d3d58167c8a3d0ed URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cf9f9e1f… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 27 00:56:03 2012 +0200 Test suite: don't use "mkdir -p" "mkdir -p" is not supported on all platforms. Tested with Apple A/UX 3.1.x. --- src/testsuite/stress-server.sh | 7 +++---- src/testsuite/tests.sh | 12 ++++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/testsuite/stress-server.sh b/src/testsuite/stress-server.sh index 0f85958..15d6df1 100755 --- a/src/testsuite/stress-server.sh +++ b/src/testsuite/stress-server.sh @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd Test Suite -# Copyright (c)2002-2004 by Alexander Barton (alex(a)barton.de) +# Copyright (c)2001-2012 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 @@ -9,8 +9,6 @@ # (at your option) any later version. # Please read the file COPYING, README and AUTHORS for more information. # -# $Id: stress-server.sh,v 1.16 2005/12/30 22:13:21 alex Exp $ -# # detect source directory [ -z "$srcdir" ] && srcdir=`dirname $0` @@ -23,7 +21,8 @@ name=`basename $0` # create directories -mkdir -p logs tests +[ -d logs ] || mkdir logs +[ -d tests ] || mkdir tests # test for required external tools type expect > /dev/null 2>&1 diff --git a/src/testsuite/tests.sh b/src/testsuite/tests.sh index 2bd9ae4..dc184ff 100755 --- a/src/testsuite/tests.sh +++ b/src/testsuite/tests.sh @@ -1,13 +1,21 @@ #!/bin/sh +# # ngIRCd Test Suite -# $Id: tests.sh,v 1.7 2004/09/06 22:04:06 alex Exp $ +# Copyright (c)2001-2012 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. +# # detect source directory [ -z "$srcdir" ] && srcdir=`dirname $0` name=`basename $0` test=`echo ${name} | cut -d '.' -f 1` -mkdir -p logs +[ -d logs ] || mkdir logs if [ ! -r "$test" ]; then echo " ${name}: test \"$test\" not found!"; exit 77

1 0

Federico G. Schwindt : ERR_CHANNELISFULL_MSG: better wording
by alex＠arthur.barton.de 27 Sep '12

27 Sep '12

Module: ngircd.git Branch: master Commit: 19ce256a95c6e8c5498c80aa730ffe5f83b7814e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=19ce256a… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Wed Sep 26 13:26:50 2012 +0100 ERR_CHANNELISFULL_MSG: better wording (cherry picked from commit 0fcfa7e00fa8e098dd3724c7188c88ac82a52881) --- src/ngircd/messages.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index f9140a4..b40f0fc 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -127,7 +127,7 @@ #define ERR_NEEDMOREPARAMS_MSG "461 %s %s :Syntax error" #define ERR_ALREADYREGISTRED_MSG "462 %s :Connection already registered" #define ERR_PASSWDMISMATCH_MSG "464 %s :Invalid password" -#define ERR_CHANNELISFULL_MSG "471 %s %s :Cannot join channel (+l) -- Channel is too full, try later" +#define ERR_CHANNELISFULL_MSG "471 %s %s :Cannot join channel (+l) -- Channel is full, try later" #define ERR_SECURECHANNEL_MSG "471 %s %s :Cannot join channel (+z) -- SSL connections only" #define ERR_OPONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+O) -- IRC opers only" #define ERR_REGONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+R) -- Registered users only"

1 0

Alexander Barton : Fix getpid.sh to work on Apple A/UX again
by alex＠arthur.barton.de 27 Sep '12

27 Sep '12

Module: ngircd.git Branch: master Commit: eba53f652ce8e0e7600b337628883d17fc3af2f2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=eba53f65… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 27 00:19:31 2012 +0200 Fix getpid.sh to work on Apple A/UX again --- src/testsuite/getpid.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh index 19ced76..96ab474 100755 --- a/src/testsuite/getpid.sh +++ b/src/testsuite/getpid.sh @@ -10,7 +10,7 @@ UNAME=`uname` if [ $UNAME = "FreeBSD" ]; then PS_FLAGS="-a"; PS_PIDCOL="1"; HEAD_FLAGS="-n 1" elif [ $UNAME = "A/UX" ]; then - PS_FLAGS="-ae"; PS_PIDCOL="1"; HEAD_FLAGS="-1" + PS_FLAGS="-af"; PS_PIDCOL="2"; HEAD_FLAGS="-1" elif [ $UNAME = "GNU" ]; then PS_FLAGS="-ax"; PS_PIDCOL="2"; HEAD_FLAGS="-n 1" elif [ $UNAME = "Linux" ]; then

1 0

Federico G. Schwindt : Send RPL_REHASHING if rehash was accepted
by alex＠arthur.barton.de 27 Sep '12

27 Sep '12

Module: ngircd.git Branch: master Commit: d8ee498a65aa86222c4ed1ffa05bf8d822aed6fd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d8ee498a… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Wed Sep 26 13:13:10 2012 +0100 Send RPL_REHASHING if rehash was accepted (cherry picked from commit f1b171a09cd076f743a7fff221fa7aa752abb374) --- src/ngircd/irc-oper.c | 2 ++ src/ngircd/messages.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 21577f0..237107f 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -183,6 +183,8 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) Log(LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask(Client)); + IRC_WriteStrClient(Client, RPL_REHASHING_MSG, Client_ID(Client)); + raise(SIGHUP); return CONNECTED; diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index d99930f..f9140a4 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -94,6 +94,7 @@ #define RPL_ENDOFMOTD_MSG "376 %s :End of MOTD command" #define RPL_WHOISHOST_MSG "378 %s %s :is connecting from *@%s %s" #define RPL_YOUREOPER_MSG "381 %s :You are now an IRC Operator" +#define RPL_REHASHING_MSG "382 %s :Rehashing" #define RPL_YOURESERVICE_MSG "383 %s :You are service %s" #define RPL_TIME_MSG "391 %s %s :%s" #define RPL_HOSTHIDDEN_MSG "396 %s %s :is your displayed hostname now"

1 0

Federico G. Schwindt : Move ConnSSL_InitLibrary() "dummy" from header into C file
by alex＠arthur.barton.de 27 Sep '12

27 Sep '12

Module: ngircd.git Branch: master Commit: 1a2bdd9e4cb31125792482b8b6d8bfcf56cd115a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1a2bdd9e… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Wed Sep 19 00:34:29 2012 +0100 Move ConnSSL_InitLibrary() "dummy" from header into C file (cherry picked from commit 5fd88c81a70d0c9e627f08522e57d251586288eb) --- src/ngircd/conf-ssl.h | 10 +++------- src/ngircd/conn-ssl.c | 7 +++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/ngircd/conf-ssl.h b/src/ngircd/conf-ssl.h index 3fab579..428bcf4 100644 --- a/src/ngircd/conf-ssl.h +++ b/src/ngircd/conf-ssl.h @@ -39,13 +39,9 @@ struct ConnSSL_State { #endif }; -bool -ConnSSL_InitLibrary(void); -#else -static inline bool -ConnSSL_InitLibrary(void) -{ return true; } -#endif /* SSL_SUPPORT */ +#endif + +bool ConnSSL_InitLibrary(void); #endif /* conf_ssl_h */ diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 914d016..fcf0dab 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -723,6 +723,13 @@ ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len) #endif } +#else + +bool +ConnSSL_InitLibrary(void) +{ + return true; +} #endif /* SSL_SUPPORT */ /* -eof- */

1 0

Federico G. Schwindt : Change variable name "SSLDHFile" to "DHFile" in log messages
by alex＠arthur.barton.de 27 Sep '12

27 Sep '12

Module: ngircd.git Branch: master Commit: e3a1a618683da1ff6d98565de71e716a5d112e34 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e3a1a618… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Wed Sep 19 00:52:50 2012 +0100 Change variable name "SSLDHFile" to "DHFile" in log messages (cherry picked from commit d96db0a2e56d310177edb45d0a8b164a37992ab1) --- src/ngircd/conn-ssl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index fcf0dab..59729e0 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -156,7 +156,7 @@ Load_DH_params(void) bool ret = true; if (!Conf_SSLOptions.DHFile) { - Log(LOG_NOTICE, "Configuration option \"SSLDHFile\" not set!"); + Log(LOG_NOTICE, "Configuration option \"DHFile\" not set!"); return false; } fp = fopen(Conf_SSLOptions.DHFile, "r"); @@ -201,7 +201,7 @@ Load_DH_params(void) } if (need_dhgenerate) { Log(LOG_WARNING, - "SSLDHFile not set, generating %u bit DH parameters. This may take a while ...", + "DHFile not set, generating %u bit DH parameters. This may take a while ...", DH_BITS); err = gnutls_dh_params_generate2(tmp_dh_params, DH_BITS); if (err < 0) {

1 0

Alexander Barton : Simplify check for valid user names in IRC_USER().
by alex＠arthur.barton.de 26 Sep '12

26 Sep '12

Module: ngircd.git Branch: master Commit: 005340c83f3f481bdcdc6a03ae9b9b2973248ceb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=005340c8… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 26 23:28:13 2012 +0200 Simplify check for valid user names in IRC_USER(). Patches from Federico G. Schwindt, thanks! (cherry picked from commit a44b7126227ba1118ec02b399e31b08102af5e8c and 6fbe9583753b2620da275676cde46a89cb4d06c2) --- src/ngircd/irc-login.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 74d8b9d..99cd26f 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -18,6 +18,7 @@ #include "imp.h" #include <assert.h> +#include <ctype.h> #include <stdlib.h> #include <string.h> #include <strings.h> @@ -422,11 +423,9 @@ IRC_USER(CLIENT * Client, REQUEST * Req) punctuation is allowed.*/ ptr = Req->argv[0]; while (*ptr) { - if ((*ptr < '0' || *ptr > '9') && - (*ptr < 'A' || *ptr > 'Z') && - (*ptr < 'a' || *ptr > 'z') && - (*ptr != '+') && (*ptr != '-') && - (*ptr != '.') && (*ptr != '_')) { + if (!isalnum(*ptr) && + *ptr != '+' && *ptr != '-' && + *ptr != '.' && *ptr != '_') { Conn_Close(Client_Conn(Client), NULL, "Invalid user name", true); return DISCONNECTED;

1 0