September 2012 - ngIRCd GIT Updates

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

DNS777 : Allow opers to see secret (+s) channels in LIST command
by alex＠arthur.barton.de 25 Sep '12

25 Sep '12

Module: ngircd.git Branch: master Commit: 62a07596d6a3a8da206bde8d34edc8b02781d33d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=62a07596… Author: DNS777 <dns(a)rbose.org> Date: Tue Sep 25 12:55:07 2012 +0200 Allow opers to see secret (+s) channels in LIST command As long as 'MorePrivacy' isn't enabled in the configuration file, local IRC operators can see secret (+s) channels when using the LIST command. Closes bug #136. --- src/ngircd/irc-channel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 9e88e1b..72fbdc2 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -669,7 +669,8 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) if (MatchCaseInsensitive(pattern, Channel_Name(chan))) { /* Gotcha! */ if (!strchr(Channel_Modes(chan), 's') - || Channel_IsMemberOf(chan, from)) { + || Channel_IsMemberOf(chan, from) + || (!Conf_MorePrivacy && Client_OperByMe(Client))) { if (IRC_CheckListTooBig(from, count, MAX_RPL_LIST, "LIST"))

1 0

Alexander Barton : configure: only use AM_PROG_AR when available
by alex＠arthur.barton.de 24 Sep '12

24 Sep '12

Module: ngircd.git Branch: master Commit: b730b64bbecfb325e28f7df1fba46942ac19968d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b730b64b… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 24 20:56:24 2012 +0200 configure: only use AM_PROG_AR when available This fixes commit 78d189fb on systems with older automake ... --- configure.ng | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ng b/configure.ng index 3ac56c4..8b47ad1 100644 --- a/configure.ng +++ b/configure.ng @@ -60,7 +60,8 @@ AC_PROG_CC_STDC # -- Helper programs -- -AM_PROG_AR +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AC_PROG_AWK AC_PROG_INSTALL AC_PROG_LN_S

1 0

Alexander Barton : Remove all geneerated Makefile.am on " make maintainer-clean"
by alex＠arthur.barton.de 24 Sep '12

24 Sep '12

Module: ngircd.git Branch: master Commit: 3e22fc32f3941ef839b570043283c53eea37470a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3e22fc32… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 24 20:45:37 2012 +0200 Remove all geneerated Makefile.am on "make maintainer-clean" --- src/ipaddr/Makefile.ng | 2 +- src/ngircd/Makefile.ng | 2 +- src/portab/Makefile.ng | 2 +- src/testsuite/Makefile.ng | 2 +- src/tool/Makefile.ng | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ipaddr/Makefile.ng b/src/ipaddr/Makefile.ng index cea6899..ecfce29 100644 --- a/src/ipaddr/Makefile.ng +++ b/src/ipaddr/Makefile.ng @@ -16,6 +16,6 @@ libngipaddr_a_SOURCES = ng_ipaddr.c noinst_HEADERS = ng_ipaddr.h maintainer-clean-local: - rm -f Makefile Makefile.in + rm -f Makefile Makefile.in Makefile.am # -eof- diff --git a/src/ngircd/Makefile.ng b/src/ngircd/Makefile.ng index 5c85335..dec6db7 100644 --- a/src/ngircd/Makefile.ng +++ b/src/ngircd/Makefile.ng @@ -103,7 +103,7 @@ clean-local: rm -f check-version check-help lint.out maintainer-clean-local: - rm -f Makefile Makefile.in + rm -f Makefile Makefile.in Makefile.am check-version: Makefile echo "#!/bin/sh" > check-version diff --git a/src/portab/Makefile.ng b/src/portab/Makefile.ng index e27980e..dac329f 100644 --- a/src/portab/Makefile.ng +++ b/src/portab/Makefile.ng @@ -28,7 +28,7 @@ portabtest_LDADD = -lngportab noinst_HEADERS = imp.h exp.h portab.h splint.h maintainer-clean-local: - rm -f Makefile Makefile.in + rm -f Makefile Makefile.in Makefile.am TESTS = portabtest diff --git a/src/testsuite/Makefile.ng b/src/testsuite/Makefile.ng index b47ba0e..b906091 100644 --- a/src/testsuite/Makefile.ng +++ b/src/testsuite/Makefile.ng @@ -31,7 +31,7 @@ clean-local: T-ngircd1 ngircd-test1.motd T-ngircd2 ngircd-test2.motd maintainer-clean-local: - rm -f Makefile Makefile.in + rm -f Makefile Makefile.in Makefile.am check_SCRIPTS = ngircd-TEST-Binary tests.sh diff --git a/src/tool/Makefile.ng b/src/tool/Makefile.ng index 460f114..d88bdc9 100644 --- a/src/tool/Makefile.ng +++ b/src/tool/Makefile.ng @@ -22,6 +22,6 @@ libngtool_a_SOURCES = tool.c noinst_HEADERS = tool.h maintainer-clean-local: - rm -f Makefile Makefile.in + rm -f Makefile Makefile.in Makefile.am # -eof-

1 0

Alexander Barton : Rename configure.in to configure.ac
by alex＠arthur.barton.de 24 Sep '12

24 Sep '12

Module: ngircd.git Branch: master Commit: e65a35e964e6a32de748f18e1f70ffe2ad146119 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e65a35e9… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 24 20:40:31 2012 +0200 Rename configure.in to configure.ac This fixes automake: warning: autoconf input should be named 'configure.ac', not 'configure.in' when running the autogen.sh script. --- .gitignore | 2 +- Makefile.am | 4 ++-- autogen.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4ccaedf..e7ab758 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ build-stamp-ngircd* config.log config.status configure -configure.in +configure.ac configure.lineno cscope.out debian diff --git a/Makefile.am b/Makefile.am index 1edd751..43b37e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors +# 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 @@ -21,7 +21,7 @@ clean-local: maintainer-clean-local: rm -rf autom4te.cache - rm -f Makefile.in Makefile aclocal.m4 configure + rm -f Makefile.in Makefile aclocal.m4 configure configure.ac rm -f ar-lib mkinstalldirs missing depcomp install-sh rm -f config.log debian diff --git a/autogen.sh b/autogen.sh index 47c476c..6c2a8dd 100755 --- a/autogen.sh +++ b/autogen.sh @@ -162,13 +162,13 @@ AM_MAKEFILES="src/ipaddr/Makefile.ng src/ngircd/Makefile.ng src/testsuite/Makefi if [ "$AM_MAJOR" -eq "1" -a "$AM_MINOR" -lt "12" ]; then # automake < 1.12 => automatic de-ANSI-fication support available echo "Enabling de-ANSI-fication support (automake $AM_VERSION) ..." - sed -e "s|^__ng_PROTOTYPES__|AM_C_PROTOTYPES|g" configure.ng >configure.in + sed -e "s|^__ng_PROTOTYPES__|AM_C_PROTOTYPES|g" configure.ng >configure.ac DEANSI_START="" DEANSI_END="" else # automake >= 1.12 => no de-ANSI-fication support available echo "Disabling de-ANSI-fication support (automake $AM_VERSION) ..." - sed -e "s|^__ng_PROTOTYPES__|AC_C_PROTOTYPES|g" configure.ng >configure.in + sed -e "s|^__ng_PROTOTYPES__|AC_C_PROTOTYPES|g" configure.ng >configure.ac DEANSI_START="#" DEANSI_END=" # disabled by ./autogen.sh script" fi

1 0

Alexander Barton : configure.ng: use AM_PROG_AR to check ar(1) command
by alex＠arthur.barton.de 24 Sep '12

24 Sep '12

Module: ngircd.git Branch: master Commit: 78d189fbf745741f42271557206cdde60d3ae857 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=78d189fb… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 24 20:39:06 2012 +0200 configure.ng: use AM_PROG_AR to check ar(1) command This fixes automake-1.12/am/library.am: warning: 'libngipaddr.a': linking libraries using a non-POSIX .../automake-1.12/am/library.am: archiver requires 'AM_PROG_AR' in 'configure.in' src/ipaddr/Makefile.am:12: while processing library 'libngipaddr.a' and similar warnings of automake. --- .gitignore | 1 + Makefile.am | 2 +- configure.ng | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bfa3542..4ccaedf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ aclocal.m4 ansi2knr.1 ansi2knr.c ansi2knr.h +ar-lib autom4te.cache build-stamp-ngircd* config.log diff --git a/Makefile.am b/Makefile.am index b451b78..1edd751 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ clean-local: maintainer-clean-local: rm -rf autom4te.cache rm -f Makefile.in Makefile aclocal.m4 configure - rm -f mkinstalldirs missing depcomp install-sh + rm -f ar-lib mkinstalldirs missing depcomp install-sh rm -f config.log debian testsuite: diff --git a/configure.ng b/configure.ng index 7f3e2d9..3ac56c4 100644 --- a/configure.ng +++ b/configure.ng @@ -60,6 +60,7 @@ AC_PROG_CC_STDC # -- Helper programs -- +AM_PROG_AR AC_PROG_AWK AC_PROG_INSTALL AC_PROG_LN_S

1 0

Alexander Barton : Merge branch 'automake-am11-am12'
by alex＠arthur.barton.de 24 Sep '12

24 Sep '12

Module: ngircd.git Branch: master Commit: 8cfb9104419d3c00fbef3fe8639eb04f03d83f3d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8cfb9104… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 24 20:28:02 2012 +0200 Merge branch 'automake-am11-am12' * automake-am11-am12: autogen.sh: detect automake version format a.b.c and a.b configure.ng: don't require GIT tree to detect version string Include .mailmap file in distribution archives Include all build-system files into distribution archives Change build system to support new and old GNU automake ---

1 0

Alexander Barton : autogen.sh: detect automake version format a.b.c and a.b
by alex＠arthur.barton.de 24 Sep '12

24 Sep '12

Module: ngircd.git Branch: master Commit: 039a939cb8a85f242a017cb4c68003af2b02dfca URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=039a939c… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 24 18:01:47 2012 +0200 autogen.sh: detect automake version format a.b.c and a.b --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index d47d750..47c476c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -153,7 +153,7 @@ echo "Searching for required tools ..." [ -z "$AUTOMAKE" ] && Notfound automake [ -z "$AUTOCONF" ] && Notfound autoconf -AM_VERSION=`$AUTOMAKE --version | egrep -o "([0-9]+\.[0-9]+\.[0-9]+)"` +AM_VERSION=`$AUTOMAKE --version|head -n 1|egrep -o "([1-9]\.[0-9]+(\.[0-9]+)*)"` ifs=$IFS; IFS="."; set $AM_VERSION; IFS=$ifs AM_MAJOR="$1"; AM_MINOR="$2"; AM_PATCHLEVEL="$3"

1 0

Alexander Barton : configure.ng: don' t require GIT tree to detect version string
by alex＠arthur.barton.de 24 Sep '12

24 Sep '12

Module: ngircd.git Branch: master Commit: d7d5f4330b15667d9f364ebabd886a062b2741fb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d7d5f433… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 24 18:00:36 2012 +0200 configure.ng: don't require GIT tree to detect version string --- configure.ng | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ng b/configure.ng index 25654f9..da723e8 100644 --- a/configure.ng +++ b/configure.ng @@ -9,7 +9,12 @@ # Please read the file COPYING, README and AUTHORS for more information. # -define(VERSION_ID,esyscmd(git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'|tr -d \\n)) +define(VERSION_ID,esyscmd([ + V=`git describe 2>/dev/null | sed -e 's/rel-//g' | sed -e 's/-/~/'`; + [ -z "$V" -a -r configure ] \ + && V=`grep "PACKAGE_STRING=" configure | cut -d"'" -f2 | cut -d' ' -f2` + ( [ -n "$V" ] && echo "$V" || echo "??" ) | tr -d '\n'; +])) # -- Initialisation --

1 0