Januar 2011 - ngIRCd GIT Updates

Florian Westphal : array: remove check for allocated == 0
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 23ce0393b23779f19d6d56103c46f9d929fdef53 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=23ce0393… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 19:40:54 2011 +0100 array: remove check for allocated == 0 allocated can only be zero if ->mem is NULL. --- src/ngircd/array.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/array.c b/src/ngircd/array.c index 75106f6..0fa9608 100644 --- a/src/ngircd/array.c +++ b/src/ngircd/array.c @@ -12,8 +12,6 @@ #include "array.h" -static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $"; - #include <assert.h> #include <stdlib.h> @@ -26,7 +24,7 @@ static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $"; -#define array_UNUSABLE(x) ( !(x)->mem || (0 == (x)->allocated) ) +#define array_UNUSABLE(x) ( !(x)->mem ) static bool safemult_sizet(size_t a, size_t b, size_t *res) { @@ -93,6 +91,7 @@ array_length(const array * const a, size_t membersize) if (array_UNUSABLE(a)) return 0; + assert(a->allocated); return membersize ? a->used / membersize : 0; } @@ -104,6 +103,7 @@ array_copy(array * dest, const array * const src) if (array_UNUSABLE(src)) return false; + assert(src->allocated); return array_copyb(dest, src->mem, src->used); }

1 0

Florian Westphal : array: remove alignment of requested size
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 994a003aba9aac4a8adca7f4f4fec0889b0f2bb1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=994a003a… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 19:28:50 2011 +0100 array: remove alignment of requested size libc should know better than us. Also, this helps debugging with tools like valgrind: When you allocate an array of size x, and then erronoulsy use x+1 valgrind cannot detect the bug because due to ALIGN_() made by array.c we might have allocated more than size x... --- src/ngircd/array.c | 36 ++++-------------------------------- 1 files changed, 4 insertions(+), 32 deletions(-) diff --git a/src/ngircd/array.c b/src/ngircd/array.c index 1e56b71..75106f6 100644 --- a/src/ngircd/array.c +++ b/src/ngircd/array.c @@ -27,12 +27,6 @@ static char UNUSED id[] = "$Id: array.c,v 1.15 2007/11/18 15:05:35 alex Exp $"; #define array_UNUSABLE(x) ( !(x)->mem || (0 == (x)->allocated) ) - -#define ALIGN_32U(x) (((x)+(unsigned)31 ) & ~((unsigned)31)) -#define ALIGN_1024U(x) (((x)+(unsigned)1023) & ~((unsigned)1023)) -#define ALIGN_4096U(x) (((x)+(unsigned)4095) & ~((unsigned)4095)) - - static bool safemult_sizet(size_t a, size_t b, size_t *res) { @@ -61,7 +55,6 @@ void * array_alloc(array * a, size_t size, size_t pos) { size_t alloc, pos_plus1 = pos + 1; - size_t aligned = 0; char *tmp; assert(size > 0); @@ -70,43 +63,22 @@ array_alloc(array * a, size_t size, size_t pos) return NULL; if (a->allocated < alloc) { - if (alloc < 128) { - aligned = ALIGN_32U(alloc); - } else { - if (alloc < 4096) { - aligned = ALIGN_1024U(alloc); - } else { - aligned = ALIGN_4096U(alloc); - } - } -#ifdef DEBUG_ARRAY - Log(LOG_DEBUG, "array_alloc(): rounded %u to %u bytes.", alloc, aligned); -#endif - - assert(aligned >= alloc); - - if (aligned < alloc) /* rounding overflow */ - return NULL; - - alloc = aligned; #ifdef DEBUG_ARRAY Log(LOG_DEBUG, "array_alloc(): changing size from %u to %u bytes.", - a->allocated, aligned); + a->allocated, alloc); #endif - tmp = realloc(a->mem, alloc); if (!tmp) return NULL; a->mem = tmp; a->allocated = alloc; - - assert(a->allocated > a->used); - memset(a->mem + a->used, 0, a->allocated - a->used); - a->used = alloc; } + + assert(a->allocated >= a->used); + return a->mem + (pos * size); }

1 0

Florian Westphal : conf: Warn if PAM= true when ngircd was built without PAM support
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: eda2556e0919e48aa8fb7556383aa81a089b4135 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=eda2556e… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 18:17:35 2011 +0100 conf: Warn if PAM=true when ngircd was built without PAM support --- src/ngircd/conf.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index db52869..5a992eb 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -899,8 +899,20 @@ WarnIdent(int UNUSED Line) if (Conf_Ident) { /* user has enabled ident lookups explicitly, but ... */ Config_Error(LOG_WARNING, - "%s: line %d: Ident=True, but ngircd was built without IDENT support", - NGIRCd_ConfFile, Line); + "%s: line %d: %s=True, but ngircd was built without support", + NGIRCd_ConfFile, Line, "Ident"); + } +#endif +} + +static void +WarnPAM(int UNUSED Line) +{ +#ifndef PAM + if (Conf_PAM) { + Config_Error(LOG_WARNING, + "%s: line %d: %s=True, but ngircd was built without support", + NGIRCd_ConfFile, Line, "PAM"); } #endif } @@ -1109,6 +1121,8 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg)); if (strcasecmp(Var, "NoIdent") == 0) WarnIdent(Line); + else if (strcasecmp(Var, "NoPam") == 0) + WarnPAM(Line); return; } if( strcasecmp( Var, "DNS" ) == 0 ) { @@ -1125,6 +1139,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) if(strcasecmp(Var, "PAM") == 0) { /* use PAM library to authenticate users */ Conf_PAM = Check_ArgIsTrue(Arg); + WarnPAM(Line); return; } if(strcasecmp(Var, "ZeroConf") == 0) {

1 0

Florian Westphal : conf: add missing static qualifier
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 9402bcaa73a9365f861108f1b53eec1c09837eef URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9402bcaa… Author: Florian Westphal <fw(a)strlen.de> Date: Sun Jan 9 17:54:21 2011 +0100 conf: add missing static qualifier internal helper, so it should be static. also, add UNUSED to 'Line'. --- src/ngircd/conf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index b194d3a..db52869 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -893,7 +893,7 @@ Handle_MaxNickLength(int Line, const char *Arg) static void -WarnIdent(int Line) +WarnIdent(int UNUSED Line) { #ifndef IDENTAUTH if (Conf_Ident) { @@ -927,7 +927,7 @@ CheckLegacyNoOption(const char *Var, const char *Arg) return false; } -const char * +static const char * NoNo(const char *str) { assert(strncasecmp("no", str, 2) == 0 && str[2]);

1 0

Alexander Barton : Update copyright notices for 2010 :)
by alex＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 6d11fb149707194e986b0d64af3d44f21e158fcc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6d11fb14… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 9 16:11:12 2011 +0100 Update copyright notices for 2010 :) And update the NEWS and ChangeLog file as well. --- AUTHORS | 5 ++--- ChangeLog | 18 +++++++++++++++--- INSTALL | 5 ++--- NEWS | 14 +++++++++++--- README | 5 ++--- src/ngircd/ngircd.c | 4 ++-- 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/AUTHORS b/AUTHORS index e0e1d07..03a19dd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,9 +1,8 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2009 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/ChangeLog b/ChangeLog index 93206ef..03090b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,27 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. -- ChangeLog -- +ngIRCd + + - Make [No]ZeroConf configuration option work with Howl. + - Deprecate NoXX-Options in ngircd.conf: 'NoDNS=no' => 'DNS=yes', + 'NoIdent=no' => 'Ident=yes', 'NoPAM=no' => 'PAM=yes', and + 'NoZeroConf=no' => 'ZeroConf=yes' (and vice-versa). + The defaults are adjusted accordingly and the old variables are still + accepted, so there is no functional change. + - Fix confusing "adding to invite list" debug messages. + - Don't throttle services and servers beeing registered. + - Xcode: correctly sort files + - Don't assert() when serching a client for an invalid server token. + ngIRCd Release 17.1 (2010-12-19) - --configtest: remember if MOTD is configured by file or phrase diff --git a/INSTALL b/INSTALL index f7e51a1..ce43e35 100644 --- a/INSTALL +++ b/INSTALL @@ -1,9 +1,8 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/NEWS b/NEWS index 9524e8b..0d6ef8a 100644 --- a/NEWS +++ b/NEWS @@ -1,15 +1,23 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. -- NEWS -- +ngIRCd + + - Deprecate NoXX-Options in ngircd.conf: 'NoDNS=no' => 'DNS=yes', + 'NoIdent=no' => 'Ident=yes', 'NoPAM=no' => 'PAM=yes', and + 'NoZeroConf=no' => 'ZeroConf=yes' (and vice-versa). + The defaults are adjusted accordingly and the old variables are still + accepted, so there is no functional change. + - Don't throttle services and servers beeing registered. + ngIRCd Release 17.1 (2010-12-19) - Don't log critical (or worse) messages to stderr diff --git a/README b/README index 1feedfe..3c39cad 100644 --- a/README +++ b/README @@ -1,9 +1,8 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2007 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2011 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 6dfd206..63fc64b 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 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 @@ -432,7 +432,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2010 Alexander Barton (<alex(a)barton.de>) and Contributors." ); + puts( "Copyright (c)2001-2011 Alexander Barton (<alex(a)barton.de>) and Contributors." ); puts( "Homepage: <http://ngircd.barton.de/>\n" ); puts( "This is free software; see the source for copying conditions. There is NO" ); puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );

1 0

Alexander Barton : Make NoZeroConf option work with Howl
by alex＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 28bbd7e27a44ff3c03f86aa6f17a578ad15ee498 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=28bbd7e2… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 9 14:31:18 2011 +0100 Make NoZeroConf option work with Howl --- src/ngircd/rendezvous.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/ngircd/rendezvous.c b/src/ngircd/rendezvous.c index 056cb1e..6727893 100644 --- a/src/ngircd/rendezvous.c +++ b/src/ngircd/rendezvous.c @@ -107,6 +107,12 @@ GLOBAL void Rendezvous_Init( void ) int i; + for (i = 0; i < MAX_RENDEZVOUS; i++) + My_Rendezvous[i].Desc[0] = '\0'; + + if (!Conf_ZeroConf) + return; + #ifdef HOWL if( sw_discovery_init( &My_Discovery_Session ) != SW_OKAY ) { @@ -122,8 +128,6 @@ GLOBAL void Rendezvous_Init( void ) exit( 1 ); } #endif - - for( i = 0; i < MAX_RENDEZVOUS; i++ ) My_Rendezvous[i].Desc[0] = '\0'; } /* Rendezvous_Init */ @@ -238,6 +242,9 @@ GLOBAL void Rendezvous_Handler( void ) /* Handle all Rendezvous stuff; this function must be called * periodically from the run loop of the main program */ + if (!Conf_ZeroConf) + return; + #ifdef APPLE int i; char buffer[MAX_MACH_MSG_SIZE];

1 0

Florian Westphal : config: deprecate NoXX-Options
by fw＠arthur.barton.de 09 Jan '11

09 Jan '11

Module: ngircd.git Branch: master Commit: 1dca082fc6f0595d6bde431bf50132445340fb7f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1dca082f… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Jan 8 15:56:14 2011 +0100 config: deprecate NoXX-Options ngircd unfortunately uses several options using double-negation, e.g. NoIdent = No, NoPam = No, etc. This renames all options by dropping the "No" prefix, e.g. "NoIdent = no" becomes "Ident = yes". The old options will continue to work, but will cause a warning message. Also update man pages and default config. To prevent silly 'Ident = yes' from appearing in --configtest output in the 'ident support not compiled in and Ident Option not used' case, make default value depend on feature availability. If feature is available, enable by default, otherwise disable. We might consider moving these options to a new [Feature] section, or something like that, because none of these options are essential. Another possible improvement: 'Ident = yes' option in ngircd.conf causes a warning if ngircd was built without ident support. This does not happen with e.g. zeroconf.... --- doc/sample-ngircd.conf.tmpl | 17 +++--- man/ngircd.conf.5.tmpl | 18 +++--- src/ngircd/client.c | 2 +- src/ngircd/conf.c | 124 +++++++++++++++++++++++++++++++++---------- src/ngircd/conf.h | 16 +++--- src/ngircd/conn.c | 4 +- src/ngircd/irc-login.c | 2 +- src/ngircd/rendezvous.c | 2 +- 8 files changed, 126 insertions(+), 59 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=1dca…

1 0