Oktober 2009 - ngIRCd GIT Updates

Florian Westphal : configtest: print ssl config options even when unset
by fw＠arthur.barton.de 17 Okt '09

17 Okt '09

Module: ngircd.git Branch: master Commit: bc88b2cb06a1663210de5f517a99687713ec91c3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bc88b2cb… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Oct 17 14:31:27 2009 +0200 configtest: print ssl config options even when unset Print "SSLOptionVar =" instead of omitting the option when running --configtest with ssl enabled. This better matches the behaviour of other options, e.g. ChrootDir. --- src/ngircd/conf.c | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index c728d55..2b592b1 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -96,38 +96,42 @@ ConfSSL_Init(void) } static bool -can_open(const char *name, const char *file) +ssl_print_configvar(const char *name, const char *file) { - FILE *fp = fopen(file, "r"); + FILE *fp; + + if (!file) { + printf(" %s =\n", name); + return true; + } + + fp = fopen(file, "r"); if (fp) fclose(fp); else fprintf(stderr, "ERROR: %s \"%s\": %s\n", name, file, strerror(errno)); + + printf(" %s = %s\n", name, file); return fp != NULL; } static bool ConfSSL_Puts(void) { - bool ret = true; + bool ret; + + ret = ssl_print_configvar("SSLKeyFile", Conf_SSLOptions.KeyFile); + + if (!ssl_print_configvar("SSLCertFile", Conf_SSLOptions.CertFile)) + ret = false; + + if (!ssl_print_configvar("SSLDHFile", Conf_SSLOptions.DHFile)) + ret = false; - if (Conf_SSLOptions.KeyFile) { - printf( " SSLKeyFile = %s\n", Conf_SSLOptions.KeyFile); - ret = can_open("SSLKeyFile", Conf_SSLOptions.KeyFile); - } - if (Conf_SSLOptions.CertFile) { - printf( " SSLCertFile = %s\n", Conf_SSLOptions.CertFile); - if (!can_open("SSLCertFile", Conf_SSLOptions.CertFile)) - ret = false; - } - if (Conf_SSLOptions.DHFile) { - printf( " SSLDHFile = %s\n", Conf_SSLOptions.DHFile); - if (!can_open("SSLDHFile", Conf_SSLOptions.DHFile)) - ret = false; - } if (array_bytes(&Conf_SSLOptions.KeyFilePassword)) - puts(" SSLKeyFilePassword = <secret>" ); + puts(" SSLKeyFilePassword = <secret>"); + array_free_wipe(&Conf_SSLOptions.KeyFilePassword); return ret;

1 0

Alexander Barton : ngIRCd release 15~rc1
by alex＠arthur.barton.de 15 Okt '09

15 Okt '09

Module: ngircd.git Branch: master Commit: bc1ac7fbc57bb6341b0b553c29d2da82464fc866 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bc1ac7fb… Author: Alexander Barton <alex(a)barton.de> Date: Thu Oct 15 10:04:34 2009 +0200 ngIRCd release 15~rc1 --- ChangeLog | 1 + NEWS | 1 + configure.in | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab0d330..8bb7508 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ ngIRCd Release 15 + ngIRCd 15~rc1 (2009-10-15) - Do not add default listening port (6667) if SSL ports were specified, so ngIRCd can be configured to only accept SSL-encrypted connections now. - Enable IRC operators to use the IRC command SQUIT (insted of the already diff --git a/NEWS b/NEWS index 247afb1..76d57b5 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,7 @@ ngIRCd Release 15 + ngIRCd 15~rc1 (2009-10-15) - Do not add default listening port (6667) if SSL ports were specified, so ngIRCd can be configured to only accept SSL-encrypted connections now. - Enable IRC operators to use the IRC command SQUIT (insted of the already diff --git a/configure.in b/configure.in index bfa800b..9e8685d 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 14.1) +AC_INIT(ngircd, 15~rc1) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index abfad7f..61d0af2 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (15~rc1-0ab1) unstable; urgency=low + + * New "upstream" release candidate 1 for ngIRCd Release 15. + + -- Alexander Barton <alex(a)barton.de> Thu, 15 Oct 2009 10:01:08 +0200 + ngircd (14.1-0ab1) unstable; urgency=high * New "upstream" release ngIRCd 14.1, fixing a security-related bug. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 1e72f30..e860326 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 14.1 +%define version 15~rc1 %define release 1 %define prefix %{_prefix}

1 0

Tag rel-15-rc1: Alexander Barton : ngIRCd release 15~rc1
by alex＠arthur.barton.de 15 Okt '09

15 Okt '09

Module: ngircd.git Branch: refs/tags/rel-15-rc1 Tag: 2c6b6c1b51ac735007eeb508e8b04461875a0bc5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=2c6b6c1b51a… Tagger: Alexander Barton <alex(a)barton.de> Date: Thu Oct 15 10:05:03 2009 +0200 ngIRCd release 15~rc1

1 0

Alexander Barton : Updated NEWS and ChangeLog files
by alex＠arthur.barton.de 03 Okt '09

03 Okt '09

Module: ngircd.git Branch: master Commit: 37e950a40ceef1e28fde92dd3b2c3bcd03800295 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=37e950a4… Author: Alexander Barton <alex(a)barton.de> Date: Sat Oct 3 16:45:09 2009 +0200 Updated NEWS and ChangeLog files --- ChangeLog | 13 ++++++++++++- NEWS | 11 +++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2300d1a..ab0d330 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,8 +10,19 @@ -- ChangeLog -- -ngIRCd Release 14.2 - +ngIRCd Release 15 + + - Do not add default listening port (6667) if SSL ports were specified, so + ngIRCd can be configured to only accept SSL-encrypted connections now. + - Enable IRC operators to use the IRC command SQUIT (insted of the already + implemented but non-standard DISCONNECT command). + - New configuration option "AllowRemoteOper" (disabled by default) that + enables remote IRC operators to use the IRC commands SQUIT and CONNECT + on the local server. + - Mac OS X: fix test for packagemaker(1) tool in Makefile and use gcc 4.0 + for Mac OS X 10.4 compatibility in the Xcode project file. + - Fix --with-{openssl|gnutls} to accept path names. + - Fix LSB header of Debian init script. - Updated doc/Platforms.txt and include new script contrib/platformtest.sh to ease generating platform reports. - Fix connection information for already registered connections. diff --git a/NEWS b/NEWS index d386de2..247afb1 100644 --- a/NEWS +++ b/NEWS @@ -10,8 +10,15 @@ -- NEWS -- -ngIRCd Release 14.2 - +ngIRCd Release 15 + + - Do not add default listening port (6667) if SSL ports were specified, so + ngIRCd can be configured to only accept SSL-encrypted connections now. + - Enable IRC operators to use the IRC command SQUIT (insted of the already + implemented but non-standard DISCONNECT command). + - New configuration option "AllowRemoteOper" (disabled by default) that + enables remote IRC operators to use the IRC commands SQUIT and CONNECT + on the local server. - Enforce upper limit on maximum number of handled commands. This implements a throttling scheme: an IRC client can send up to 3 commands or 256 bytes per second before a one second pause is enforced.

1 0