Februar 2012 - ngIRCd GIT Updates

Tag rel-19: Alexander Barton : RCd release 19
by alex＠arthur.barton.de 29 Feb '12

29 Feb '12

Module: ngircd.git Branch: refs/tags/rel-19 Tag: 8265d98eaa43469b6e96341d7f7516c3e98282ac URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=8265d98eaa4… Tagger: Alexander Barton <alex(a)barton.de> Date: Wed Feb 29 17:35:53 2012 +0100 RCd release 19

1 0

Alexander Barton : ngIRCd release 19
by alex＠arthur.barton.de 29 Feb '12

29 Feb '12

Module: ngircd.git Branch: master Commit: 9e7360e5faea1468f0906f993c965b8b085ee46a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9e7360e5… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 29 17:35:32 2012 +0100 ngIRCd release 19 --- ChangeLog | 13 ++++++++++++- NEWS | 3 ++- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 056ee48..037ce1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,18 @@ -- ChangeLog -- -ngIRCd Release 19 +ngIRCd Release 19 (2012-02-29) + + - Update build system: bump config.guess and config.sub files used by + GNU autoconf/automake to recent versions. + - Fix configuration file parser: don't accept "[SSL]" blocks in the + configuration file when no SSL support is built in ngIRCd. + - Fix building ngIRCd with old gcc versions (e. g. 2.7.2). + - Correctly re-open syslog logging after reading of configuration + file: Syslog logging has been initialized before reading the + configuraton, so ngIRCd always used the default facility and ignored + the "SyslogFacility" configuration option ... + Thanks to Patrik Schindler for reporting this issue! ngIRCd 19~rc1 (2012-02-12) - Enhance command limits for server links: the limit now is dependent diff --git a/NEWS b/NEWS index fcb7788..4fa98dc 100644 --- a/NEWS +++ b/NEWS @@ -8,7 +8,8 @@ -- NEWS -- -ngIRCd Release 19 + +ngIRCd Release 19 (2012-02-29) ngIRCd 19~rc1 (2012-02-12) - Update preliminary ngIRCd protocol module for Anope 1.9.6, which now diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index e6c9569..205e382 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (19-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 19. + + -- Alexander Barton <alex(a)barton.de> Wed, 29 Feb 2012 17:34:08 +0100 + ngircd (19~rc1-0ab1) unstable; urgency=low * New "upstream" release candidate 1 for ngIRCd Release 19. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index cb93169..e1d5d12 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 19~rc1 +%define version 19 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Merge branch 'master' of /srv/git/ngircd
by alex＠arthur.barton.de 29 Feb '12

29 Feb '12

Module: ngircd.git Branch: master Commit: 273d4bdd32de33d4632ee48b681d3ffff158e359 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=273d4bdd… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 29 14:47:37 2012 +0100 Merge branch 'master' of /srv/git/ngircd * 'master' of /srv/git/ngircd: Update doc/Platforms.txt for ngIRCd 19 doc/README-Interix.txt: note that GNU make should be used ---

1 0

Alexander Barton : Update config.guess and config.sub to recent versions
by alex＠arthur.barton.de 29 Feb '12

29 Feb '12

Module: ngircd.git Branch: master Commit: ef392e7d3781e3919718cf55fa87d5a8f8bdd354 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ef392e7d… Author: Alexander Barton <alex(a)barton.de> Date: Mon Feb 27 16:39:01 2012 +0100 Update config.guess and config.sub to recent versions --- config.guess | 490 +++++++++++++++++++++++++++++----------------------------- config.sub | 269 +++++++++++++++++++++++--------- 2 files changed, 439 insertions(+), 320 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=ef39…

1 0

Alexander Barton : Update doc/Platforms.txt for ngIRCd 19
by alex＠arthur.barton.de 29 Feb '12

29 Feb '12

Module: ngircd.git Branch: master Commit: 27d244dfae5e0909957dab9f2e5958de215608c8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=27d244df… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 29 14:42:41 2012 +0100 Update doc/Platforms.txt for ngIRCd 19 --- doc/Platforms.txt | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 58913c3..2f71038 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. @@ -31,23 +31,23 @@ hppa1.1/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y hppa2.0/unknown/linux-gnu gcc 3.3.5 13~rc1 08-12-02 alex Y Y Y Y hppa2.0w-hp-hpux11.11 gcc 4.2.3 14.1 09-07-22 goetz Y Y Y Y i386/apple/darwin9.7.0 gcc 4.0.1 14.1 09-08-04 alex Y Y Y Y (3) -i386/apple/darwin10.7.0 gcc 4.2.1 18 11-07-05 alex Y Y Y Y (3) -i386/apple/darwin11.0.0 gcc 4.2.1 18 11-07-02 alex Y Y Y Y (3) +i386/apple/darwin10.8.0 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) +i386/apple/darwin11.3.0 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) i386/pc/solaris2.9 gcc 3.2.2 CVSHEAD 04-02-24 alex Y Y Y Y -i386/pc/solaris2.11 gcc 3.4.3 18 11-07-10 alex Y Y N Y (4) +i386/pc/solaris2.11 gcc 3.4.3 19 12-02-26 alex Y Y N Y (4) i386/pc/solaris2.11 gcc 4.2.3 18 11-08-17 goetz Y Y Y Y (4) i386/unknown/freebsd5.2.1 gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y -i386/unknown/freebsd6.2 gcc 3.4.6 18 11-07-10 alex Y Y Y Y (3) -i386/unknown/freebsd7.3 gcc 4.2.1 18 11-07-10 alex Y Y Y Y (3) -i686/unknown/gnu0.3 gcc 4.4.5 18 11-07-10 alex Y Y Y Y +i386/unknown/freebsd6.2 gcc 3.4.6 19 12-02-26 alex Y Y Y Y (3) +i386/unknown/freebsd7.3 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) +i686/unknown/gnu0.3 gcc 4.4.5 19 12-02-29 alex Y Y Y Y i686/unkn./kfreebsd7.2-gnu gcc 4.3.4 15 09-12-02 alex Y Y Y Y (3) i386/unknown/netbsdelf1.6.2 gcc 2.95.3 18 11-07-10 goetz Y Y Y Y i386/unknown/netbsdelf3.0.1 gcc 3.3.3 0.10.0-p1 06-08-30 alex Y Y Y Y (3) -i386/unknown/netbsdelf4.0 gcc 4.1.2 18 11-07-10 alex Y Y Y Y (3) -i386/unknown/netbsdelf5.0.2 gcc 4.1.3 18 11-07-10 alex Y Y Y Y (3) +i386/unknown/netbsdelf4.0 gcc 4.1.2 19 12-02-29 alex Y Y Y Y (3) +i386/unknown/netbsdelf5.0.2 gcc 4.1.3 19 12-02-26 alex Y Y Y Y (3) i386/unknown/openbsd3.9 gcc 3.3.5 0.10.0-p1 06-08-30 alex Y Y Y Y (3) i386/unknown/openbsd4.1 gcc 3.3.5 16 10-04-11 alex Y Y Y Y (3) -i586/pc/interix3.5 gcc 3.3 18 11-07-10 alex Y Y N Y +i586/pc/interix3.5 gcc 3.3 19 12-02-29 alex Y Y N Y i686/pc/cygwin gcc 3.3.1 0.8.0 04-05-30 alex Y Y N Y i686/pc/linux-gnu gcc 2.95.4 0.8.0 04-05-30 alex Y Y Y Y (1) i686/pc/linux-gnu gcc 3.3.5 14.1 09-08-04 alex Y Y Y Y (1) @@ -55,8 +55,8 @@ i386/pc/linux-gnu gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y (1) i686/pc/linux-gnu gcc 4.3.2 14.1 09-08-04 alex Y Y Y Y (1) m68k/apple/aux3.0.1 gcc 2.7.2 17 10-11-07 alex Y Y N Y m68k/apple/aux3.0.1 Orig. A/UX 17 10-11-07 alex Y Y N Y (2) -m68k/apple/aux3.1.1 gcc 2.7.2 18 11-07-02 alex Y Y N Y -m68k/apple/aux3.1.1 Orig. A/UX 18 11-07-02 alex Y Y N Y (2) +m68k/apple/aux3.1.1 gcc 2.7.2 19 12-02-26 alex Y Y N Y +m68k/apple/aux3.1.1 Orig. A/UX 19 12-02-26 alex Y Y N Y (2) m68k/hp/hp-ux9.10 Orig. HPUX 0.7.x-CVS 03-04-30 goetz Y Y Y Y m88k/dg/dgux5.4R3.10 gcc 2.5.8 CVSHEAD 04-03-15 alex Y Y ? ? mipsel/unknown/linux-gnu gcc 4.1.2 18 11-07-05 goetz Y Y N Y (1) @@ -69,9 +69,10 @@ powerpc/unknown/openbsd3.6 gcc 2.95.3 0.10.0 06-10-08 alex Y Y N Y sparc/sun/solaris2.6 gcc 2.95.3 0.7.x-CVS 03-04-22 alex Y Y Y Y sparc/sun/solaris2.7 gcc 3.3 0.8.0 04-05-30 alex Y Y Y Y sparc/unkn./netbsdelf1.6.1 gcc 2.95.3 0.8.0 04-05-30 alex Y Y Y Y -x86_64/unknown/freebsd8.1 gcc 4.2.1 18 11-07-10 alex Y Y Y Y (3) -x86_64/unknown/linux-gnu gcc 4.4.5 18 11-07-02 alex Y Y Y Y (1) -x86_64/unknown/openbsd4.7 gcc 3.3.5 18 11-07-10 alex Y Y Y Y (3) +x86_64/unknown/freebsd8.1 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) +x86_64/unkn./freebsd8.1-gnu gcc 4.4.5 19 12-02-26 alex Y Y Y Y (3) +x86_64/unknown/linux-gnu gcc 4.4.5 19 12-02-26 alex Y Y Y Y (1) +x86_64/unknown/openbsd4.7 gcc 3.3.5 19 12-02-26 alex Y Y Y Y (3) Notes

1 0

Alexander Barton : Update Updated doc/Platforms.txt for ngIRCd 19
by alex＠arthur.barton.de 29 Feb '12

29 Feb '12

Module: ngircd.git Branch: master Commit: 29aa324471db694f4eae108246163e0a13c19d5b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=29aa3244… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 29 14:42:41 2012 +0100 Update Updated doc/Platforms.txt for ngIRCd 19 --- doc/Platforms.txt | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 58913c3..2f71038 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. @@ -31,23 +31,23 @@ hppa1.1/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y hppa2.0/unknown/linux-gnu gcc 3.3.5 13~rc1 08-12-02 alex Y Y Y Y hppa2.0w-hp-hpux11.11 gcc 4.2.3 14.1 09-07-22 goetz Y Y Y Y i386/apple/darwin9.7.0 gcc 4.0.1 14.1 09-08-04 alex Y Y Y Y (3) -i386/apple/darwin10.7.0 gcc 4.2.1 18 11-07-05 alex Y Y Y Y (3) -i386/apple/darwin11.0.0 gcc 4.2.1 18 11-07-02 alex Y Y Y Y (3) +i386/apple/darwin10.8.0 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) +i386/apple/darwin11.3.0 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) i386/pc/solaris2.9 gcc 3.2.2 CVSHEAD 04-02-24 alex Y Y Y Y -i386/pc/solaris2.11 gcc 3.4.3 18 11-07-10 alex Y Y N Y (4) +i386/pc/solaris2.11 gcc 3.4.3 19 12-02-26 alex Y Y N Y (4) i386/pc/solaris2.11 gcc 4.2.3 18 11-08-17 goetz Y Y Y Y (4) i386/unknown/freebsd5.2.1 gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y -i386/unknown/freebsd6.2 gcc 3.4.6 18 11-07-10 alex Y Y Y Y (3) -i386/unknown/freebsd7.3 gcc 4.2.1 18 11-07-10 alex Y Y Y Y (3) -i686/unknown/gnu0.3 gcc 4.4.5 18 11-07-10 alex Y Y Y Y +i386/unknown/freebsd6.2 gcc 3.4.6 19 12-02-26 alex Y Y Y Y (3) +i386/unknown/freebsd7.3 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) +i686/unknown/gnu0.3 gcc 4.4.5 19 12-02-29 alex Y Y Y Y i686/unkn./kfreebsd7.2-gnu gcc 4.3.4 15 09-12-02 alex Y Y Y Y (3) i386/unknown/netbsdelf1.6.2 gcc 2.95.3 18 11-07-10 goetz Y Y Y Y i386/unknown/netbsdelf3.0.1 gcc 3.3.3 0.10.0-p1 06-08-30 alex Y Y Y Y (3) -i386/unknown/netbsdelf4.0 gcc 4.1.2 18 11-07-10 alex Y Y Y Y (3) -i386/unknown/netbsdelf5.0.2 gcc 4.1.3 18 11-07-10 alex Y Y Y Y (3) +i386/unknown/netbsdelf4.0 gcc 4.1.2 19 12-02-29 alex Y Y Y Y (3) +i386/unknown/netbsdelf5.0.2 gcc 4.1.3 19 12-02-26 alex Y Y Y Y (3) i386/unknown/openbsd3.9 gcc 3.3.5 0.10.0-p1 06-08-30 alex Y Y Y Y (3) i386/unknown/openbsd4.1 gcc 3.3.5 16 10-04-11 alex Y Y Y Y (3) -i586/pc/interix3.5 gcc 3.3 18 11-07-10 alex Y Y N Y +i586/pc/interix3.5 gcc 3.3 19 12-02-29 alex Y Y N Y i686/pc/cygwin gcc 3.3.1 0.8.0 04-05-30 alex Y Y N Y i686/pc/linux-gnu gcc 2.95.4 0.8.0 04-05-30 alex Y Y Y Y (1) i686/pc/linux-gnu gcc 3.3.5 14.1 09-08-04 alex Y Y Y Y (1) @@ -55,8 +55,8 @@ i386/pc/linux-gnu gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y (1) i686/pc/linux-gnu gcc 4.3.2 14.1 09-08-04 alex Y Y Y Y (1) m68k/apple/aux3.0.1 gcc 2.7.2 17 10-11-07 alex Y Y N Y m68k/apple/aux3.0.1 Orig. A/UX 17 10-11-07 alex Y Y N Y (2) -m68k/apple/aux3.1.1 gcc 2.7.2 18 11-07-02 alex Y Y N Y -m68k/apple/aux3.1.1 Orig. A/UX 18 11-07-02 alex Y Y N Y (2) +m68k/apple/aux3.1.1 gcc 2.7.2 19 12-02-26 alex Y Y N Y +m68k/apple/aux3.1.1 Orig. A/UX 19 12-02-26 alex Y Y N Y (2) m68k/hp/hp-ux9.10 Orig. HPUX 0.7.x-CVS 03-04-30 goetz Y Y Y Y m88k/dg/dgux5.4R3.10 gcc 2.5.8 CVSHEAD 04-03-15 alex Y Y ? ? mipsel/unknown/linux-gnu gcc 4.1.2 18 11-07-05 goetz Y Y N Y (1) @@ -69,9 +69,10 @@ powerpc/unknown/openbsd3.6 gcc 2.95.3 0.10.0 06-10-08 alex Y Y N Y sparc/sun/solaris2.6 gcc 2.95.3 0.7.x-CVS 03-04-22 alex Y Y Y Y sparc/sun/solaris2.7 gcc 3.3 0.8.0 04-05-30 alex Y Y Y Y sparc/unkn./netbsdelf1.6.1 gcc 2.95.3 0.8.0 04-05-30 alex Y Y Y Y -x86_64/unknown/freebsd8.1 gcc 4.2.1 18 11-07-10 alex Y Y Y Y (3) -x86_64/unknown/linux-gnu gcc 4.4.5 18 11-07-02 alex Y Y Y Y (1) -x86_64/unknown/openbsd4.7 gcc 3.3.5 18 11-07-10 alex Y Y Y Y (3) +x86_64/unknown/freebsd8.1 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) +x86_64/unkn./freebsd8.1-gnu gcc 4.4.5 19 12-02-26 alex Y Y Y Y (3) +x86_64/unknown/linux-gnu gcc 4.4.5 19 12-02-26 alex Y Y Y Y (1) +x86_64/unknown/openbsd4.7 gcc 3.3.5 19 12-02-26 alex Y Y Y Y (3) Notes

1 0

Alexander Barton : doc/README-Interix.txt: note that GNU make should be used
by alex＠arthur.barton.de 29 Feb '12

29 Feb '12

Module: ngircd.git Branch: master Commit: a39a1a5273f953c7c25bcb5b89c607444368d072 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a39a1a52… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 29 13:20:09 2012 +0100 doc/README-Interix.txt: note that GNU make should be used --- doc/README-Interix.txt | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/doc/README-Interix.txt b/doc/README-Interix.txt index 8f5451f..f24f38d 100644 --- a/doc/README-Interix.txt +++ b/doc/README-Interix.txt @@ -1,12 +1,10 @@ - ngIRCd - Next Generation IRC Server - - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ + ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the - terms of the GNU General Public License. - + terms of the GNU General Public License. -- README-Interix.txt -- @@ -20,10 +18,13 @@ Windows Server 2003. SUA is supported on Windows Server 2003 R2, Windows Server 2008 & 2008 R2, Windows Vista, and Windows 7 -- so ngIRCd should be able to run on all of these platforms. -But please note that the poll() API function is not fully implemented by -SFU/SUA and therefore can't be used by ngIRCd -- which normally would be -the default. Please see <http://www.suacommunity.com/faqs.aspx> section -4.25 for details: +But please note that two things: + +1. Don't use the poll() IO API + +The poll() API function is not fully implemented by SFU/SUA and therefore +can't be used by ngIRCd -- which normally would be the default. Please see +<http://www.suacommunity.com/faqs.aspx> section 4.25 for details: "If you do try to use the poll() API your program will block on the API call forever. You must direct your program to build using the @@ -35,3 +36,9 @@ So when running the ./configure script, you HAVE TO DISABLE poll() support: ngIRCd then defaults to using the select() API function which works fine. +2. Use GNU make(1) + +Starting with ngIRCd 18, our build system doesn't work with the default +make(1) binary of Interix, you should use GNU make instead (tested with +version 3.82 built from source). +

1 0

Alexander Barton : Don't accept "[SSL]" in config when no SSL support is built in
by alex＠arthur.barton.de 26 Feb '12

26 Feb '12

Module: ngircd.git Branch: master Commit: c38751191f5811cbd45a0723e39c88785a854e9f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c3875119… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 26 15:52:12 2012 +0100 Don't accept "[SSL]" in config when no SSL support is built in --- src/ngircd/conf.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index f18016b..58ce9ca 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -854,10 +854,13 @@ Read_Config( bool ngircd_starting ) /* Is this the beginning of a new section? */ if(( str[0] == '[' ) && ( str[strlen( str ) - 1] == ']' )) { strlcpy( section, str, sizeof( section )); - if (strcasecmp(section, "[GLOBAL]") == 0 || - strcasecmp(section, "[LIMITS]") == 0 || - strcasecmp(section, "[OPTIONS]") == 0 || - strcasecmp(section, "[SSL]") == 0) + if (strcasecmp(section, "[GLOBAL]") == 0 + || strcasecmp(section, "[LIMITS]") == 0 + || strcasecmp(section, "[OPTIONS]") == 0 +#ifdef SSL_SUPPORT + || strcasecmp(section, "[SSL]") == 0 +#endif + ) continue; if( strcasecmp( section, "[SERVER]" ) == 0 ) {

1 0

Alexander Barton : Fix C syntax: duplicate "; ; " should be "; "
by alex＠arthur.barton.de 26 Feb '12

26 Feb '12

Module: ngircd.git Branch: master Commit: 5cbdcf4f0d44709798469f09a72d4b4bd56d6e93 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5cbdcf4f… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 26 15:27:04 2012 +0100 Fix C syntax: duplicate ";;" should be ";" Using gcc 2.7.2, this fixes: irc-channel.c: In function `join_allowed': irc-channel.c:86: parse error before `const' --- src/ngircd/irc-channel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 5ea108a..d714b48 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -82,7 +82,7 @@ static bool join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, const char *key) { - bool is_invited, is_banned, is_exception;; + bool is_invited, is_banned, is_exception; const char *channel_modes; /* Allow IRC operators to overwrite channel limits */

1 0

Alexander Barton : Correctly re-open syslog logging after reading of configuration
by alex＠arthur.barton.de 14 Feb '12

14 Feb '12

Module: ngircd.git Branch: master Commit: 3641e511095203818df7ca05439cf42eb7c7c954 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3641e511… Author: Alexander Barton <alex(a)barton.de> Date: Tue Feb 14 11:01:13 2012 +0100 Correctly re-open syslog logging after reading of configuration Syslog logging has been initialized before reading the configuraton file, so ngIRCd always used the default facility and ignored the "SyslogFacility" configuration option. Thanks to Patrik Schindler for reporting this issue! --- src/ngircd/log.c | 23 +++++++++++++++++++++++ src/ngircd/log.h | 3 ++- src/ngircd/ngircd.c | 4 ++-- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 80b2c05..d81bec2 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -64,6 +64,12 @@ Log_Message(int Level, const char *msg) } +/** + * Initialitze logging. + * This function is called before the configuration file is read in. + * + * @param Daemon_Mode Set to true if ngIRCd is running as daemon. + */ GLOBAL void Log_Init(bool Daemon_Mode) { @@ -80,6 +86,23 @@ Log_Init(bool Daemon_Mode) } /* Log_Init */ +/** + * Re-init logging after reading the configuration file. + */ +GLOBAL void +Log_ReInit(void) +{ +#ifdef SYSLOG +#ifndef LOG_CONS /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS */ +#define LOG_CONS 0 +#endif + closelog(); + openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); +#endif + Log(LOG_NOTICE, "%s started.", NGIRCd_Version); +} + + GLOBAL void Log_Exit( void ) { diff --git a/src/ngircd/log.h b/src/ngircd/log.h index 5222b5d..f582e6c 100644 --- a/src/ngircd/log.h +++ b/src/ngircd/log.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) * * 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 @@ -36,6 +36,7 @@ GLOBAL void Log_Init PARAMS(( bool Daemon_Mode )); GLOBAL void Log_Exit PARAMS(( void )); GLOBAL void Log PARAMS(( int Level, const char *Format, ... )); +GLOBAL void Log_ReInit PARAMS((void)); GLOBAL void Log_ServerNotice PARAMS((char UserMode, const char *Format, ...)); diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 874dfa3..60d15a1 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -255,11 +255,11 @@ main(int argc, const char *argv[]) NGIRCd_SignalRestart = false; NGIRCd_SignalQuit = false; - Random_Init(); - /* Initialize modules, part I */ Log_Init(!NGIRCd_NoDaemon); + Random_Init(); Conf_Init(); + Log_ReInit(); /* Initialize the "main program": chroot environment, user and * group ID, ... */

1 0