- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Include netinet/in_systm.h alongside netinet/ip.h
by alex＠arthur.barton.de 11 Apr '10

11 Apr '10

Module: ngircd.git Branch: master Commit: 1caa3fb94b6e23d7b63183f6cb6c97ed1821350c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1caa3fb9… Author: Alexander Barton <alex(a)barton.de> Date: Sun Apr 11 16:58:29 2010 +0000 Include netinet/in_systm.h alongside netinet/ip.h This fixes the following error when compiling on e.g. FreeBSD 6.x: In file included from conn.c:40: /usr/include/netinet/ip.h:160: error: syntax error before "n_long" /usr/include/netinet/ip.h:163: error: syntax error before "n_long" --- src/ngircd/conn.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index ab975b3..0ff6067 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -37,6 +37,7 @@ #include <netinet/in.h> #ifdef HAVE_NETINET_IP_H +# include <netinet/in_systm.h> # include <netinet/ip.h> #endif

1 0

Alexander Barton : Only compile in Get_Error() if really needed
by alex＠arthur.barton.de 09 Apr '10

09 Apr '10

Module: ngircd.git Branch: master Commit: 628c6c962b1054de4c27304f53c4ac7c50c79a11 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=628c6c96… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 9 20:06:44 2010 +0200 Only compile in Get_Error() if really needed This fixes "resolve.c:150: warning: ‘Get_Error’ defined but not used". --- src/ngircd/resolve.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 37d1c51..bccf518 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -144,8 +144,8 @@ Resolve_Init(RES_STAT *s) } -#ifndef WANT_IPV6 -#ifdef h_errno +#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) +#if !defined(WANT_IPV6) && defined(h_errno) static char * Get_Error( int H_Error ) { @@ -162,8 +162,8 @@ Get_Error( int H_Error ) } return "unknown error"; } -#endif /* h_errno */ -#endif /* WANT_IPV6 */ +#endif +#endif /* Do "IDENT" (aka "AUTH") lookup and append result to resolved_addr array */

1 0

Alexander Barton : Fix gcc warning "ignoring return value of ..."
by alex＠arthur.barton.de 09 Apr '10

09 Apr '10

Module: ngircd.git Branch: master Commit: 025342fe46ae504a08be8c642901ec7eb7c4fccb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=025342fe… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 9 20:08:47 2010 +0200 Fix gcc warning "ignoring return value of ..." This patch fixes two warnings of gcc 4.4.3 when used with eglibc 2.11.1: ngircd.c: In function ‘NGIRCd_Init’: ngircd.c:801: warning: ignoring return value of ‘chdir’, declared with attribute warn_unused_result conn.c: In function ‘Simple_Message’: conn.c:2041: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result The first by checking the return code and an appropriate error message, the second by "better" ignoring it (which is correct there!) ... --- src/ngircd/conn.c | 32 ++++++++++++++++++++++---------- src/ngircd/ngircd.c | 4 +++- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index cd350a8..ab975b3 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2025,20 +2025,32 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) } /* cb_Read_Resolver_Result */ +/** + * Write a "simple" (error) message to a socket. + * The message is sent without using the connection write buffers, without + * compression/encryption, and even without any error reporting. It is + * designed for error messages of e.g. New_Connection(). */ static void -Simple_Message( int Sock, const char *Msg ) +Simple_Message(int Sock, const char *Msg) { char buf[COMMAND_LEN]; size_t len; - /* Write "simple" message to socket, without using compression - * or even the connection write buffers. Used e.g. for error - * messages by New_Connection(). */ - assert( Sock > NONE ); - assert( Msg != NULL ); - - strlcpy( buf, Msg, sizeof buf - 2); - len = strlcat( buf, "\r\n", sizeof buf); - (void)write(Sock, buf, len); + + assert(Sock > NONE); + assert(Msg != NULL); + + strlcpy(buf, Msg, sizeof buf - 2); + len = strlcat(buf, "\r\n", sizeof buf); + if (write(Sock, buf, len) < 0) { + /* Because this function most probably got called to log + * an error message, any write error is ignored here to + * avoid an endless loop. But casting the result of write() + * to "void" doesn't satisfy the GNU C code attribute + * "warn_unused_result" which is used by some versions of + * glibc (e.g. 2.11.1), therefore this silly error + * "handling" code here :-( */ + return; + } } /* Simple_Error */ diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 82ba67c..b951bad 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -798,7 +798,9 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) #else setpgrp(0, getpid()); #endif - chdir( "/" ); + if (chdir( "/" ) != 0) + Log(LOG_ERR, "Can't change directory to '/': %s", + strerror(errno)); /* Detach stdin, stdout and stderr */ Setup_FDStreams( );

1 0

Alexander Barton : Updated some more copyright notices, it's 2010 already ( part 2)
by alex＠arthur.barton.de 02 Apr '10

02 Apr '10

Module: ngircd.git Branch: master Commit: 1ed49de83a335713ee437171335c93725dd19ee6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1ed49de8… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 2 14:22:07 2010 +0200 Updated some more copyright notices, it's 2010 already (part 2) Silly me forgot the most important place, the program output itself ... --- src/ngircd/ngircd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 5fc88c9..82ba67c 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2009 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 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 @@ -562,7 +562,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2009 Alexander Barton (<alex(a)barton.de>) and Contributors." ); + puts( "Copyright (c)2001-2010 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 : Updated some more copyright notices, it's 2010 already : -)
by alex＠arthur.barton.de 02 Apr '10

02 Apr '10

Module: ngircd.git Branch: master Commit: bb914b93e9cd2a2e92d75e1d611f1541365e2e76 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bb914b93… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 2 14:19:36 2010 +0200 Updated some more copyright notices, it's 2010 already :-) --- ChangeLog | 2 +- contrib/MacOSX/ngIRCd.pmdoc/index.xml | 4 ++-- doc/Platforms.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 878eb25..c7b1303 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2009 Alexander Barton, + (c)2001-2010 Alexander Barton, alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the diff --git a/contrib/MacOSX/ngIRCd.pmdoc/index.xml b/contrib/MacOSX/ngIRCd.pmdoc/index.xml index 2881d58..5d6b8e3 100644 --- a/contrib/MacOSX/ngIRCd.pmdoc/index.xml +++ b/contrib/MacOSX/ngIRCd.pmdoc/index.xml @@ -4,7 +4,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-2009 Alexander Barton and Contributors.\ +Copyright (c)2001-2010 Alexander Barton and Contributors.\ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural \i0 \cf0 \ @@ -187,4 +187,4 @@ To disable automatic starting of ngIRCd, use this command:\ \ls2\ilvl0 \f1\fs24 \cf0 sudo launchctl unload -w \\\ /Library/LaunchDaemons/de.barton.ngircd.plist\ -}]]></resource></locale></resources><flags/><item type="file">01ngircd.xml</item><item type="file">02de.xml</item><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc> \ No newline at end of file +}]]></resource></locale></resources><flags/><item type="file">01ngircd.xml</item><item type="file">02de.xml</item><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc> diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 8629252..f1f3658 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2009 Alexander Barton + (c)2001-2010 Alexander Barton alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the

1 0

Tag rel-16-rc1: Alexander Barton : ngIRCd release 16~rc1
by alex＠arthur.barton.de 25 Mär '10

25 Mär '10

Module: ngircd.git Branch: refs/tags/rel-16-rc1 Tag: 7d02cbdc66430188fe60c59a84156d13ba79063a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=7d02cbdc664… Tagger: Alexander Barton <alex(a)barton.de> Date: Thu Mar 25 16:10:20 2010 +0100 ngIRCd release 16~rc1

1 0

Alexander Barton : ngIRCd release 16~rc1
by alex＠arthur.barton.de 25 Mär '10

25 Mär '10

Module: ngircd.git Branch: master Commit: 50e8a62c5cfe8eaaeeaaccc5ff577cedf72e848d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=50e8a62c… Author: Alexander Barton <alex(a)barton.de> Date: Thu Mar 25 15:57:11 2010 +0100 ngIRCd release 16~rc1 --- configure.in | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index f80e8a9..153ec57 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 15) +AC_INIT(ngircd, 16~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 0f76b3d..4bab648 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (16~rc1-0ab1) unstable; urgency=low + + * New "upstream" release candidate 1 for ngIRCd Release 16. + + -- Alexander Barton <alex(a)barton.de> Thu, 25 Mar 2010 15:56:03 +0100 + ngircd (15-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 15. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index bce620a..d83ff70 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 15 +%define version 16~rc1 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Updated NEWS and ChangeLog file for ngIRCd 16-rc1
by alex＠arthur.barton.de 25 Mär '10

25 Mär '10

Module: ngircd.git Branch: master Commit: aa32fec1b6d5d1679ede9e5109c7f6ebe95c0983 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=aa32fec1… Author: Alexander Barton <alex(a)barton.de> Date: Thu Mar 25 14:55:31 2010 +0100 Updated NEWS and ChangeLog file for ngIRCd 16-rc1 --- ChangeLog | 26 ++++++++++++++++++++++++++ NEWS | 5 +++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b38170..878eb25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,32 @@ -- ChangeLog -- +ngIRCd Release 16 + + ngIRCd 16~rc1 (2010-03-25) + - Various fixes to the build system and code cleanups. + - contrib/platformtest.sh: Only show latest commit. + - Updatet doc/Platforms.txt, added new README-Interix.txt documenting + how to tun ngIRCd on Microsoft Services for UNIX (MS SFU, MS SUA). + - Updated links to the ngIRCd homepage (bug tracker, mailing list). + - Added missing modes to USERMODES #define + - Show our name (IRCD=ngIRCd) in ISUPPORT (005) numeric + - Quote received messages of ERROR commands in log output. + - ngircd.conf manual page: document missing "Password" variable. + - Implement WEBIRC command used by some Web-IRC frontends. The password + required to secure this command must be configured using the new + "WebircPassword" variable in the ngircd.conf file. + - Don't use port 6668 as example for both "Ports" and "SSLPorts". + - Remove limit on max number of configured irc operators. + - Only link "nsl" library when really needed. + - A new channel mode "secure connections only" (+z) has been implemented: + Only clients using a SSL encrypted connection to the server are allowed + to join such a channel. + But please note three things: a) already joined clients are not checked + when setting this mode, b) IRC operators are always allowed to join + every channel, and c) remote clients using a server not supporting this + mode are not checked either and therefore always allowed to join. + ngIRCd Release 15 (2009-11-07) - "ngircd --configtest": print SSL configuration options even when unset. diff --git a/NEWS b/NEWS index 3457312..7c6f948 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,11 @@ ngIRCd Release 16 + ngIRCd 16~rc1 (2010-03-25) + - Implement WEBIRC command used by some Web-IRC frontends. The password + required to secure this command must be configured using the new + "WebircPassword" variable in the ngircd.conf file. + - Remove limit on max number of configured irc operators. - A new channel mode "secure connections only" (+z) has been implemented: Only clients using a SSL encrypted connection to the server are allowed to join such a channel.

1 0

Alexander Barton : Don't use port 6668 as example for both "Ports" and " SSLPorts"
by alex＠arthur.barton.de 16 Mär '10

16 Mär '10

Module: ngircd.git Branch: master Commit: cbe41ec87506003e484a85301b3c0a6e05bf0ad7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cbe41ec8… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 16 16:16:03 2010 +0100 Don't use port 6668 as example for both "Ports" and "SSLPorts" --- doc/sample-ngircd.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf index db326c9..daa0801 100644 --- a/doc/sample-ngircd.conf +++ b/doc/sample-ngircd.conf @@ -48,7 +48,7 @@ ;Ports = 6667, 6668, 6669 # Additional Listen Ports that expect SSL/TLS encrypted connections - ;SSLPorts = 9999,6668 + ;SSLPorts = 6697, 9999 # SSL Server Key ;SSLKeyFile = /usr/local/etc/ngircd/ssl/server-key.pem

1 0

Florian Westphal : configure.in: only add -lnsl when needed
by fw＠arthur.barton.de 17 Feb '10

17 Feb '10

Module: ngircd.git Branch: master Commit: 20276f7cc967ec1a472715574adc6792b1598314 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=20276f7c… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Feb 17 22:23:14 2010 +0100 configure.in: only add -lnsl when needed dpkg-shlibdeps: warning: dependency on libnsl.so.1 [..] (they use none of its symbols). As shown via commit 2b14234abc252383679bae2d23861b773dc9713e (dpkg-shlibdeps: warning: dependency on libnsl.so.1) and the following revert of that commit, we cannot simply drop the AC_CHECK_LIB(nsl). Although -lnsl is indeed unneeded when glibc is used, some platforms (e.g. Solaris) need it. Use AC_SEARCH_LIBS instead to only link when the library exports a particular symbol. --- configure.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 10a72d3..f80e8a9 100644 --- a/configure.in +++ b/configure.in @@ -131,9 +131,11 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),, # -- Libraries -- +# A/UX needs this. AC_CHECK_LIB(UTIL,memmove) +# needed on solaris. GNU libc also has a libnsl, but we do not need it. +AC_SEARCH_LIBS(gethostbyname,nsl) AC_CHECK_LIB(socket,bind) -AC_CHECK_LIB(nsl,gethostent) # -- Functions --

1 0