- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Refactor Read_Motd() into Read_TextFile()
by alex＠arthur.barton.de 02 Jan '13

02 Jan '13

Module: ngircd.git Branch: master Commit: 9e1c25a889d7a18c1df7f13da64dc38e1a3a9eec URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9e1c25a8… Author: Alexander Barton <alex(a)barton.de> Date: Mon Dec 31 19:26:31 2012 +0100 Refactor Read_Motd() into Read_TextFile() Now this function allows to read arbitrary text files into arrays. --- src/ngircd/conf.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index bea4d61..423221c 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -784,39 +784,44 @@ no_listenports(void) } /** - * Read MOTD ("message of the day") file. + * Read contents of a text file into an array. + * + * This function is used to read the MOTD and help text file, for exampe. * * @param filename Name of the file to read. + * @return true, when the file has been read in. */ -static void -Read_Motd(const char *filename) +static bool +Read_TextFile(const char *Filename, const char *Name, array *Destination) { char line[127]; FILE *fp; + int line_no = 1; - if (*filename == '\0') - return; + if (*Filename == '\0') + return false; - fp = fopen(filename, "r"); + fp = fopen(Filename, "r"); if (!fp) { - Config_Error(LOG_WARNING, "Can't read MOTD file \"%s\": %s", - filename, strerror(errno)); - return; + Config_Error(LOG_WARNING, "Can't read %s file \"%s\": %s", + Name, Filename, strerror(errno)); + return false; } - array_free(&Conf_Motd); - Using_MotdFile = true; - + array_free(Destination); while (fgets(line, (int)sizeof line, fp)) { - ngt_TrimLastChr( line, '\n'); + ngt_TrimLastChr(line, '\n'); /* add text including \0 */ - if (!array_catb(&Conf_Motd, line, strlen(line) + 1)) { - Log(LOG_WARNING, "Cannot add MOTD text: %s", strerror(errno)); + if (!array_catb(Destination, line, strlen(line) + 1)) { + Log(LOG_WARNING, "Cannot read/add \"%s\", line %d: %s", + Filename, line_no, strerror(errno)); break; } + line_no++; } fclose(fp); + return true; } /** @@ -1037,8 +1042,10 @@ Read_Config(bool TestOnly, bool IsStarting) } /* No MOTD phrase configured? (re)try motd file. */ - if (array_bytes(&Conf_Motd) == 0) - Read_Motd(Conf_MotdFile); + if (array_bytes(&Conf_Motd) == 0) { + if (Read_TextFile(Conf_MotdFile, "MOTD", &Conf_Motd)) + Using_MotdFile = true; + } #ifdef SSL_SUPPORT /* Make sure that all SSL-related files are readable */

1 0

Tag rel-20.1: Alexander Barton : ngIRCd Release 20.1
by alex＠arthur.barton.de 02 Jan '13

02 Jan '13

Module: ngircd.git Branch: refs/tags/rel-20.1 Tag: de78434aa26d1bb3da2604a9a787d56f3d9b121a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=de78434aa26… Tagger: Alexander Barton <alex(a)barton.de> Date: Wed Jan 2 22:38:08 2013 +0100 ngIRCd Release 20.1

1 0

Alexander Barton : ngIRCd Release 20.1
by alex＠arthur.barton.de 02 Jan '13

02 Jan '13

Module: ngircd.git Branch: master Commit: 21493731dffa0f5d9f62d24cdef290be6a6856fd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=21493731… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 2 22:37:55 2013 +0100 ngIRCd Release 20.1 --- ChangeLog | 16 +++++++++++++++- NEWS | 4 ++++ contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e2a042..a4cfdb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,13 +2,27 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. -- ChangeLog -- +ngIRCd 20.1 (2013-01-02) + + - Allow ERROR command on server and service links only, ignore them and + add a penalty time on all other link types. + - Enforced mode setting by IRC Operators: Only check the channel user + modes of the initiator if he is joined to the channel and not an IRC + operator enforcing modes (which requires the configuration option + "OperCanUseMode" to be enabled), because trying to check channel user + modes of a non-member results in an assertion when running with debug + code or could crash the daemon otherwise. This closes bug #147, thanks + to James Kirwill <james.kirwill(a)bk.ru> for tracking this down! + - Fix build system to cope with spaces in path names. + - Code cleanups, mostly to fix build warnings on Cygwin. + ngIRCd 20 (2012-12-17) - Allow user names ("INDENT") up to 20 characters when ngIRCd has not diff --git a/NEWS b/NEWS index c3f9c49..be743e6 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,10 @@ -- NEWS -- +ngIRCd 20.1 (2013-01-02) + + - This release is a bugfix release only, without new features. + ngIRCd 20 (2012-12-17) - Allow user names ("INDENT") up to 20 characters when ngIRCd has not diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 2a9c2df..03c3df6 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (20.1-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 20.1. + + -- Alexander Barton <alex(a)barton.de> Wed, 02 Jan 2013 22:37:26 +0100 + ngircd (20-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 20. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 9632bc0..fa0a6a1 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 20 +%define version 20.1 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Update Copyright notices for 2013
by alex＠arthur.barton.de 01 Jan '13

01 Jan '13

Module: ngircd.git Branch: master Commit: 1f59821270e7298b380183778672e6db9c87971b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1f598212… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 1 19:23:56 2013 +0100 Update Copyright notices for 2013 --- AUTHORS | 2 +- INSTALL | 2 +- NEWS | 2 +- README | 2 +- contrib/MacOSX/ngIRCd.pmdoc/index.xml | 2 +- src/ngircd/ngircd.c | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index 986beef..1d061a6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/INSTALL b/INSTALL index b445958..de60feb 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 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 96ecdc8..c3f9c49 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/README b/README index 11d140d..c903aa1 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2013 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/contrib/MacOSX/ngIRCd.pmdoc/index.xml b/contrib/MacOSX/ngIRCd.pmdoc/index.xml index 34b3baa..e665bc6 100644 --- a/contrib/MacOSX/ngIRCd.pmdoc/index.xml +++ b/contrib/MacOSX/ngIRCd.pmdoc/index.xml @@ -5,7 +5,7 @@ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural \f0\i\fs24 \cf0 ngIRCd -- The Next Generation IRC Daemon\ -Copyright (c)2001-2011 Alexander Barton and Contributors.\ +Copyright (c)2001-2013 Alexander Barton and Contributors.\ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural \i0 \cf0 \ diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index f016b6a..dfae336 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2013 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 @@ -460,7 +460,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2012 Alexander Barton (<alex(a)barton.de>) and Contributors." ); + puts( "Copyright (c)2001-2013 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 : Allow ERROR command on server and service links only
by alex＠arthur.barton.de 31 Dez '12

31 Dez '12

Module: ngircd.git Branch: master Commit: 3e47bc9af511716bbe388f0a29b5fdbb617cee4c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3e47bc9a… Author: Alexander Barton <alex(a)barton.de> Date: Mon Dec 31 21:46:41 2012 +0100 Allow ERROR command on server and service links only Ignore it and add a penalty time on all other link types. --- src/ngircd/irc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 63c4813..a678f90 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -81,6 +81,17 @@ IRC_ERROR( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); + if (Client_Type(Client) != CLIENT_GOTPASS + && Client_Type(Client) != CLIENT_GOTPASS_2813 + && Client_Type(Client) != CLIENT_UNKNOWNSERVER + && Client_Type(Client) != CLIENT_SERVER + && Client_Type(Client) != CLIENT_SERVICE) { + LogDebug("Ignored ERROR command from \"%s\" ...", + Client_Mask(Client)); + IRC_SetPenalty(Client, 2); + return CONNECTED; + } + if (Req->argc < 1) Log(LOG_NOTICE, "Got ERROR from \"%s\"!", Client_Mask(Client));

1 0

Alexander Barton : Get rid of Conn_ResetPenalty(), it is unused
by alex＠arthur.barton.de 31 Dez '12

31 Dez '12

Module: ngircd.git Branch: master Commit: 5d921984873b708c2f91bed01689f6351d95c233 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5d921984… Author: Alexander Barton <alex(a)barton.de> Date: Mon Dec 31 18:23:21 2012 +0100 Get rid of Conn_ResetPenalty(), it is unused --- src/ngircd/conn-func.c | 18 ------------------ src/ngircd/conn-func.h | 1 - 2 files changed, 19 deletions(-) diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c index e81a79e..9647674 100644 --- a/src/ngircd/conn-func.c +++ b/src/ngircd/conn-func.c @@ -117,24 +117,6 @@ Conn_SetPenalty(CONN_ID Idx, time_t Seconds) } /* Conn_SetPenalty */ -/** - * Reset the "penalty time" for one connection. - * - * @param Idx Connection index. - * @see Conn_SetPenalty - */ -GLOBAL void -Conn_ResetPenalty(CONN_ID Idx) -{ - assert(Idx > NONE); - - My_Connections[Idx].delaytime = 0; -#ifdef DEBUG - Log(LOG_DEBUG, "Penalty time on connection %d has been reset."); -#endif -} /* Conn_ResetPenalty */ - - GLOBAL void Conn_ClearFlags( void ) { diff --git a/src/ngircd/conn-func.h b/src/ngircd/conn-func.h index 21bbcdb..1d05acc 100644 --- a/src/ngircd/conn-func.h +++ b/src/ngircd/conn-func.h @@ -45,7 +45,6 @@ GLOBAL long Conn_RecvBytes PARAMS(( CONN_ID Idx )); GLOBAL const char *Conn_IPA PARAMS(( CONN_ID Idx )); GLOBAL void Conn_SetPenalty PARAMS(( CONN_ID Idx, time_t Seconds )); -GLOBAL void Conn_ResetPenalty PARAMS(( CONN_ID Idx )); GLOBAL void Conn_ClearFlags PARAMS(( void )); GLOBAL int Conn_Flag PARAMS(( CONN_ID Idx ));

1 0

Alexander Barton : Mode setting: only check channel user modes when on channel
by alex＠arthur.barton.de 31 Dez '12

31 Dez '12

Module: ngircd.git Branch: master Commit: 20ddffca0d5ae5393adc57b67ba90e15d33e2ee3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=20ddffca… Author: Alexander Barton <alex(a)barton.de> Date: Mon Dec 31 18:13:18 2012 +0100 Mode setting: only check channel user modes when on channel Only check the channel user modes of the initiator if he is joined to this channel and not an IRC operator enforcing modes (which requires the configuration option "OperCanUseMode" to be enabled), because trying to check channel user modes of a non-member results in this assertion: Assertion failed: (cl2chan != NULL), function Channel_UserModes, file channel.c, line 742. This closes bug #147, thanks to James Kirwill <james.kirwill(a)bk.ru> for tracking this down! --- src/ngircd/irc-mode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 3221997..a63a0f4 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -550,7 +550,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) if (arg_arg >= Req->argc) arg_arg = -1; - if(!is_machine) { + if(!is_machine && !is_oper) { o_mode_ptr = Channel_UserModes(Channel, Client); while( *o_mode_ptr ) { if ( *o_mode_ptr == 'q')

1 0

Alexander Barton : Add some more casts in assert() statemens
by alex＠arthur.barton.de 25 Dez '12

25 Dez '12

Module: ngircd.git Branch: master Commit: 25e56a5e837173a567a0873bd5a9ccc126cff333 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=25e56a5e… Author: Alexander Barton <alex(a)barton.de> Date: Tue Dec 25 19:21:40 2012 +0100 Add some more casts in assert() statemens This fixes the following warning messages of gcc 4.5.3 on Cygwin when building with debug code enabled: ng_ipaddr.c: In function ‘ng_ipaddr_init’: ng_ipaddr.c:52:2: warning: comparison between signed and unsigned integer expressions ng_ipaddr.c:53:20: warning: comparison between signed and unsigned integer expressions resolve.c: In function ‘ForwardLookup’: resolve.c:271:3: warning: comparison between signed and unsigned integer expressions --- src/ipaddr/ng_ipaddr.c | 4 ++-- src/ngircd/resolve.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ipaddr/ng_ipaddr.c b/src/ipaddr/ng_ipaddr.c index 05ef6ec..9cf35ec 100644 --- a/src/ipaddr/ng_ipaddr.c +++ b/src/ipaddr/ng_ipaddr.c @@ -49,8 +49,8 @@ ng_ipaddr_init(ng_ipaddr_t *addr, const char *ip_str, UINT16 port) if (ret != 0) return false; - assert(sizeof(*addr) >= res0->ai_addrlen); - if (sizeof(*addr) >= res0->ai_addrlen) + assert(sizeof(*addr) >= (size_t)res0->ai_addrlen); + if (sizeof(*addr) >= (size_t)res0->ai_addrlen) memcpy(addr, res0->ai_addr, res0->ai_addrlen); else ret = -1; diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 3f99b3a..6078da8 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -268,7 +268,7 @@ ForwardLookup(const char *hostname, array *IpAddr, int af) } for (a = ai_results; a != NULL; a = a->ai_next) { - assert(a->ai_addrlen <= sizeof(addr)); + assert((size_t)a->ai_addrlen <= sizeof(addr)); if ((size_t)a->ai_addrlen > sizeof(addr)) continue;

1 0

Alexander Barton : Makefiles: Correctly quote sed expressions
by alex＠arthur.barton.de 25 Dez '12

25 Dez '12

Module: ngircd.git Branch: master Commit: 1e5a7aac877f2b5d105d8cb291b107217b140632 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1e5a7aac… Author: Alexander Barton <alex(a)barton.de> Date: Tue Dec 25 19:13:55 2012 +0100 Makefiles: Correctly quote sed expressions Now the Makefiles support spaces in "$sysconfdir", which isn't uncommon for Cygwin for example, when $HOME contains whitespaces ("/home/User Name") and ngIRCd is installed into the user home ("./configure --prefix=$HOME"). --- doc/Makefile.am | 2 +- man/Makefile.am | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index cd51d7f..2b9b3aa 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -11,7 +11,7 @@ .tmpl: $(AM_V_GEN)sed \ - -e s@:ETCDIR:@${sysconfdir}@ \ + -e "s@:ETCDIR:@${sysconfdir}@" \ <$< >$@ SUFFIXES = .tmpl diff --git a/man/Makefile.am b/man/Makefile.am index 5624e2a..077d0ea 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,15 +1,12 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001,2002 by Alexander Barton (alex(a)barton.de) +# Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors # -# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen -# der GNU General Public License (GPL), wie von der Free Software Foundation -# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 -# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. -# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste -# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. -# -# $Id: Makefile.am,v 1.6 2006/12/25 16:13:26 alex Exp $ +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. # TEMPLATE_MANS = ngircd.conf.5.tmpl ngircd.8.tmpl @@ -18,9 +15,9 @@ SUFFIXES = .tmpl . .tmpl: $(AM_V_GEN)sed \ - -e s@:SBINDIR:@${sbindir}@ \ - -e s@:BINDIR:@${bindir}@ \ - -e s@:ETCDIR:@${sysconfdir}@ \ + -e "s@:SBINDIR:@${sbindir}@" \ + -e "s@:BINDIR:@${bindir}@" \ + -e "s@:ETCDIR:@${sysconfdir}@" \ <$< >$@ man_MANS = ngircd.conf.5 ngircd.8

1 0

Alexander Barton : Add Cygwin binaries (*.exe) to .gitignore files
by alex＠arthur.barton.de 25 Dez '12

25 Dez '12

Module: ngircd.git Branch: master Commit: b5b3dd9cfd7e1a10eecc92c8b23bd65945b61a31 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b5b3dd9c… Author: Alexander Barton <alex(a)barton.de> Date: Tue Dec 25 18:52:49 2012 +0100 Add Cygwin binaries (*.exe) to .gitignore files --- src/ngircd/.gitignore | 1 + src/portab/.gitignore | 1 + src/testsuite/.gitignore | 2 ++ 3 files changed, 4 insertions(+) diff --git a/src/ngircd/.gitignore b/src/ngircd/.gitignore index d1148bf..39a55e7 100644 --- a/src/ngircd/.gitignore +++ b/src/ngircd/.gitignore @@ -2,3 +2,4 @@ Makefile.am check-help check-version ngircd +ngircd.exe diff --git a/src/portab/.gitignore b/src/portab/.gitignore index 9bac6ac..9b94606 100644 --- a/src/portab/.gitignore +++ b/src/portab/.gitignore @@ -1,2 +1,3 @@ Makefile.am portabtest +portabtest.exe diff --git a/src/testsuite/.gitignore b/src/testsuite/.gitignore index b33a08f..d17f3b2 100644 --- a/src/testsuite/.gitignore +++ b/src/testsuite/.gitignore @@ -1,6 +1,8 @@ Makefile.am T-ngircd1 +T-ngircd1.exe T-ngircd2 +T-ngircd2.exe channel-test connect-test invite-test

1 0