- ngIRCd GIT Updates - lists.barton.de

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

Alexander Barton : NJOIN: correctly reset channel level flags
by alex＠arthur.barton.de 26 Sep '12

26 Sep '12

Module: ngircd.git Branch: master Commit: 384f965fba126c4724bffb6f7e2d30d8b7fb50cb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=384f965f… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 26 23:51:05 2012 +0200 NJOIN: correctly reset channel level flags This fixes commit 7b01bb83. Bug reported by DNS777 <dns(a)rbose.org>, thanks! --- src/ngircd/irc-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 380ab62..d605745 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -219,7 +219,7 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) ptr = strtok( nick_in, "," ); while( ptr ) { - is_op = is_voiced = false; + is_owner = is_chanadmin = is_op = is_halfop = is_voiced = false; /* cut off prefixes */ while(( *ptr == '~') || ( *ptr == '&' ) || ( *ptr == '@' ) ||

1 0

Alexander Barton : Allow user mode +x only when "CloakHostModeX" is set
by alex＠arthur.barton.de 26 Sep '12

26 Sep '12

Module: ngircd.git Branch: master Commit: d21afce2b6fdc919a80c4eb1d6ba781c1cf63f3c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d21afce2… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 26 22:52:06 2012 +0200 Allow user mode +x only when "CloakHostModeX" is set Allow users to "cloak" their hostname only when the configuration variable "CloakHostModeX" (introduced in 19.2) is set. Otherwise, only IRC opertators, other servers, and services are allowed to set mode +x. This prevents regular users from changing their hostmask to the name of the IRC server itself, which confused quite a few people ;-) This fixes bug #133. --- INSTALL | 8 ++++++++ src/ngircd/irc-mode.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 640df4e..b445958 100644 --- a/INSTALL +++ b/INSTALL @@ -12,6 +12,14 @@ I. Upgrade Information ~~~~~~~~~~~~~~~~~~~~~~ +Differences to version 19.x + +- Starting with ngIRCd 20, users can "cloak" their hostname only when the + configuration variable "CloakHostModeX" (introduced in 19.2) is set. + Otherwise, only IRC opertators, other servers, and services are allowed to + set mode +x. This prevents regular users from changing their hostmask to + the name of the IRC server itself, which confused quite a few people ;-) + Differences to version 17 - Support for ZeroConf/Bonjour/Rendezvous service registration has been diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 7380c6e..90f638d 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -278,9 +278,15 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) ok = IRC_WriteStrClient(Origin, ERR_RESTRICTED_MSG, Client_ID(Origin)); - else + else if (!set || Conf_CloakHostModeX[0] + || Client_Type(Client) == CLIENT_SERVER + || Client_OperByMe(Client)) { x[0] = 'x'; send_RPL_HOSTHIDDEN_MSG = true; + } else + ok = IRC_WriteStrClient(Origin, + ERR_NOPRIVILEGES_MSG, + Client_ID(Origin)); break; default: if (Client_Type(Client) != CLIENT_SERVER) {

1 0

Alexander Barton : Allow user mode +x only when "CloakHostModeX" is set
by alex＠arthur.barton.de 26 Sep '12

26 Sep '12

Module: ngircd.git Branch: master Commit: e7fb8429496e9ae8b3767b80d2256ecb354a601a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e7fb8429… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 26 22:52:06 2012 +0200 Allow user mode +x only when "CloakHostModeX" is set Allow users to "cloak" their hostname only when the configuration variable "CloakHostModeX" (introduced in 19.2) is set. Otherwise, only IRC opertators, other servers, and services are allowed to set mode +x. This prevents regular users from changing their hostmask to the name of the IRC server itself, which confused quite a few people ;-) --- INSTALL | 8 ++++++++ src/ngircd/irc-mode.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 640df4e..b445958 100644 --- a/INSTALL +++ b/INSTALL @@ -12,6 +12,14 @@ I. Upgrade Information ~~~~~~~~~~~~~~~~~~~~~~ +Differences to version 19.x + +- Starting with ngIRCd 20, users can "cloak" their hostname only when the + configuration variable "CloakHostModeX" (introduced in 19.2) is set. + Otherwise, only IRC opertators, other servers, and services are allowed to + set mode +x. This prevents regular users from changing their hostmask to + the name of the IRC server itself, which confused quite a few people ;-) + Differences to version 17 - Support for ZeroConf/Bonjour/Rendezvous service registration has been diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 7380c6e..90f638d 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -278,9 +278,15 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) ok = IRC_WriteStrClient(Origin, ERR_RESTRICTED_MSG, Client_ID(Origin)); - else + else if (!set || Conf_CloakHostModeX[0] + || Client_Type(Client) == CLIENT_SERVER + || Client_OperByMe(Client)) { x[0] = 'x'; send_RPL_HOSTHIDDEN_MSG = true; + } else + ok = IRC_WriteStrClient(Origin, + ERR_NOPRIVILEGES_MSG, + Client_ID(Origin)); break; default: if (Client_Type(Client) != CLIENT_SERVER) {

1 0

DNS777 : New configuration option "OperChanPAutoOp"
by alex＠arthur.barton.de 25 Sep '12

25 Sep '12

Module: ngircd.git Branch: master Commit: 808c291c76b7ecb4ae13b6ee12e8afe658b627c1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=808c291c… Author: DNS777 <dns(a)rbose.org> Date: Tue Sep 25 13:08:39 2012 +0200 New configuration option "OperChanPAutoOp" If disabled, IRC operators don't become channel operators in persistent channels when joining. Enabled by default, which has been the behavior of ngIRCd up to this patch. Closes bug #135. (Cosmetic fixes by Alex.) --- doc/sample-ngircd.conf.tmpl | 3 +++ man/ngircd.conf.5.tmpl | 4 ++++ src/ngircd/conf.c | 7 +++++++ src/ngircd/conf.h | 3 +++ src/ngircd/irc-channel.c | 6 ++++-- 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 57e6589..018855d 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -165,6 +165,9 @@ # they are not(!) channel-operators? ;OperCanUseMode = no + # Should IRC Operators get AutoOp (+o) in persistent (+P) channels? + ;OperChanPAutoOp = yes + # Mask IRC Operator mode requests as if they were coming from the # server? (This is a compatibility hack for ircd-irc2 servers) ;OperServerMode = no diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index aff11a6..c03cf74 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -268,6 +268,10 @@ while connecting. Default: no. Should IRC Operators be allowed to use the MODE command even if they are not(!) channel-operators? Default: no. .TP +\fBOperChanPAutoOp\fR (boolean) +Should IRC Operators get AutoOp (+o) in persistent (+P) channels? +Default: yes. +.TP \fBOperServerMode\fR (boolean) If \fBOperCanUseMode\fR is enabled, this may lead the compatibility problems with Servers that run the ircd-irc2 Software. This Option "masks" mode diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 0052de8..4ac37ad 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -372,6 +372,7 @@ Conf_Test( void ) printf(" MorePrivacy = %s\n", yesno_to_str(Conf_MorePrivacy)); printf(" NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth)); printf(" OperCanUseMode = %s\n", yesno_to_str(Conf_OperCanMode)); + printf(" OperChanPAutoOp = %s\n", yesno_to_str(Conf_OperChanPAutoOp)); printf(" OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode)); #ifdef PAM printf(" PAM = %s\n", yesno_to_str(Conf_PAM)); @@ -733,6 +734,7 @@ Set_Defaults(bool InitServers) Conf_MorePrivacy = false; Conf_NoticeAuth = false; Conf_OperCanMode = false; + Conf_OperChanPAutoOp = true; Conf_OperServerMode = false; #ifdef PAM Conf_PAM = true; @@ -1181,6 +1183,7 @@ CheckLegacyGlobalOption(int Line, char *Var, char *Arg) || strcasecmp(Var, "ConnectIPv4") == 0 || strcasecmp(Var, "ConnectIPv6") == 0 || strcasecmp(Var, "OperCanUseMode") == 0 + || strcasecmp(Var, "OperChanPAutoOp") == 0 || strcasecmp(Var, "OperServerMode") == 0 || strcasecmp(Var, "PredefChannelsOnly") == 0 || strcasecmp(Var, "SyslogFacility") == 0 @@ -1556,6 +1559,10 @@ Handle_OPTIONS(int Line, char *Var, char *Arg) Conf_OperCanMode = Check_ArgIsTrue(Arg); return; } + if (strcasecmp(Var, "OperChanPAutoOp") == 0) { + Conf_OperChanPAutoOp = Check_ArgIsTrue(Arg); + return; + } if (strcasecmp(Var, "OperServerMode") == 0) { Conf_OperServerMode = Check_ArgIsTrue(Arg); return; diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 7a4e38a..90d74d2 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -151,6 +151,9 @@ GLOBAL bool Conf_PredefChannelsOnly; /** Flag indicating if IRC operators are allowed to always use MODE (true) */ GLOBAL bool Conf_OperCanMode; +/** Flag indicating if IRC operators get AutoOp in persistent (+P) channels */ +GLOBAL bool Conf_OperChanPAutoOp; + /** * If true, mask channel MODE commands of IRC operators to the server. * Background: ircd2 will ignore channel MODE commands if an IRC operator diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 72fbdc2..4a157d6 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -167,8 +167,10 @@ join_set_channelmodes(CHANNEL *chan, CLIENT *target, const char *flags) } } - /* If channel persistent and client is ircop: make client chanop */ - if (strchr(Channel_Modes(chan), 'P') && strchr(Client_Modes(target), 'o')) + /* If the channel is persistent (+P) and client is an IRC op: + * make client chanop, if not disabled in configuration. */ + if (strchr(Channel_Modes(chan), 'P') && Conf_OperChanPAutoOp + && strchr(Client_Modes(target), 'o')) Channel_UserModeAdd(chan, target, 'o'); } /* join_set_channelmodes */

1 0