Index: AUTHORS =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/AUTHORS,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -r1.5.2.1 -r1.5.2.2 --- AUTHORS 7 Nov 2003 20:51:08 -0000 1.5.2.1 +++ AUTHORS 3 Feb 2004 16:01:29 -0000 1.5.2.2 @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2003 by Alexander Barton, + (c)2001-2004 by Alexander Barton, alex@barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -30,4 +30,4 @@ -- -$Id: AUTHORS,v 1.5.2.1 2003/11/07 20:51:08 alex Exp $ +$Id: AUTHORS,v 1.5.2.2 2004/02/03 16:01:29 alex Exp $ Index: ChangeLog =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/ChangeLog,v retrieving revision 1.188.2.19 retrieving revision 1.188.2.24 diff -u -r1.188.2.19 -r1.188.2.24 --- ChangeLog 5 Dec 2003 13:40:24 -0000 1.188.2.19 +++ ChangeLog 5 Feb 2004 13:33:24 -0000 1.188.2.24 @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2003 by Alexander Barton, + (c)2001-2004 by Alexander Barton, alex@barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -10,6 +10,15 @@ -- ChangeLog -- +ngIRCd 0.7.7 (2004-02-05) + + - The info text ("real name") of users is set to "-" if none has been + specified using the USER command (e. g. "USER user * * :"). Reason: + the original ircd doesn't like empty ones and would KILL such users. + - Fixed (optional) TCP Wrapper test which was broken and could result in + false results. Thanks to Fuminori Tanizaki ! + - Removed "USE_" prefixes of configuration #defines. + ngIRCd 0.7.6 (2003-12-05) - Fixed abort() ("server crash") when INVITE'ing users to nonexistent @@ -484,4 +493,4 @@ -- -$Id: ChangeLog,v 1.188.2.19 2003/12/05 13:40:24 alex Exp $ +$Id: ChangeLog,v 1.188.2.24 2004/02/05 13:33:24 alex Exp $ Index: INSTALL =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/INSTALL,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -u -r1.15.2.1 -r1.15.2.2 --- INSTALL 22 Apr 2003 20:00:32 -0000 1.15.2.1 +++ INSTALL 3 Feb 2004 16:01:29 -0000 1.15.2.2 @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2003 by Alexander Barton, + (c)2001-2004 by Alexander Barton, alex@barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -158,4 +158,4 @@ -- -$Id: INSTALL,v 1.15.2.1 2003/04/22 20:00:32 alex Exp $ +$Id: INSTALL,v 1.15.2.2 2004/02/03 16:01:29 alex Exp $ Index: NEWS =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/NEWS,v retrieving revision 1.53.2.5 retrieving revision 1.53.2.6 diff -u -r1.53.2.5 -r1.53.2.6 --- NEWS 7 Nov 2003 20:51:08 -0000 1.53.2.5 +++ NEWS 3 Feb 2004 16:01:29 -0000 1.53.2.6 @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2003 by Alexander Barton, + (c)2001-2004 by Alexander Barton, alex@barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -174,4 +174,4 @@ -- -$Id: NEWS,v 1.53.2.5 2003/11/07 20:51:08 alex Exp $ +$Id: NEWS,v 1.53.2.6 2004/02/03 16:01:29 alex Exp $ Index: README =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/README,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -r1.17 -r1.17.2.1 --- README 9 Mar 2003 22:03:58 -0000 1.17 +++ README 3 Feb 2004 16:01:29 -0000 1.17.2.1 @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2003 by Alexander Barton, + (c)2001-2004 by Alexander Barton, alex@barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -83,4 +83,4 @@ -- -$Id: README,v 1.17 2003/03/09 22:03:58 alex Exp $ +$Id: README,v 1.17.2.1 2004/02/03 16:01:29 alex Exp $ Index: configure.in =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/configure.in,v retrieving revision 1.89.2.13 retrieving revision 1.89.2.16 diff -u -r1.89.2.13 -r1.89.2.16 --- configure.in 5 Dec 2003 13:40:24 -0000 1.89.2.13 +++ configure.in 5 Feb 2004 13:33:24 -0000 1.89.2.16 @@ -8,13 +8,13 @@ # (at your option) any later version. # Please read the file COPYING, README and AUTHORS for more information. # -# $Id: configure.in,v 1.89.2.13 2003/12/05 13:40:24 alex Exp $ +# $Id: configure.in,v 1.89.2.16 2004/02/05 13:33:24 alex Exp $ # # -- Initialisierung -- AC_PREREQ(2.50) -AC_INIT(ngircd, 0.7.6) +AC_INIT(ngircd, 0.7.7) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) @@ -26,9 +26,9 @@ AH_TEMPLATE([HAVE_socklen_t], [Define if socklen_t exists]) AH_TEMPLATE([SNIFFER], [Define if IRC sniffer should be enabled]) AH_TEMPLATE([STRICT_RFC], [Define if ngIRCd should behave strict RFC compliant]) -AH_TEMPLATE([USE_SYSLOG], [Define if syslog should be used for logging]) -AH_TEMPLATE([USE_ZLIB], [Define if zlib compression should be enabled]) -AH_TEMPLATE([USE_TCPWRAP], [Define if TCP wrappers should be used]) +AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging]) +AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled]) +AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used]) AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used]) AH_TEMPLATE([RENDEZVOUS], [Define if Rendezvous support should be included]) @@ -162,7 +162,7 @@ ] ) if test "$x_syslog_on" = "yes"; then - AC_DEFINE(USE_SYSLOG, 1) + AC_DEFINE(SYSLOG, 1) AC_CHECK_HEADERS(syslog.h) fi @@ -181,7 +181,7 @@ ] ) if test "$x_zlib_on" = "yes"; then - AC_DEFINE(USE_ZLIB, 1) + AC_DEFINE(ZLIB, 1) AC_CHECK_HEADERS(zlib.h) fi @@ -198,7 +198,7 @@ ptr = hosts_access; ],[ AC_MSG_RESULT(yes) - AC_DEFINE(USE_TCPWRAP, 1) + AC_DEFINE(TCPWRAP, 1) x_tcpwrap_on=yes ],[ AC_MSG_RESULT(no) Index: contrib/ngircd.spec =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/contrib/ngircd.spec,v retrieving revision 1.2.4.6 retrieving revision 1.2.4.7 diff -u -r1.2.4.6 -r1.2.4.7 --- contrib/ngircd.spec 29 Nov 2003 20:29:02 -0000 1.2.4.6 +++ contrib/ngircd.spec 5 Feb 2004 13:33:24 -0000 1.2.4.7 @@ -1,5 +1,5 @@ %define name ngircd -%define version 0.7.5 +%define version 0.7.7 %define release 1 %define prefix %{_prefix} Index: debian/changelog =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/debian/Attic/changelog,v retrieving revision 1.2.2.7 retrieving revision 1.2.2.8 diff -u -r1.2.2.7 -r1.2.2.8 --- debian/changelog 5 Dec 2003 13:40:24 -0000 1.2.2.7 +++ debian/changelog 5 Feb 2004 13:33:24 -0000 1.2.2.8 @@ -1,3 +1,9 @@ +ngircd (0.7.7-0ab1) unstable; urgency=low + + * New upstream version. + + -- Alexander Barton Thu, 5 Feb 2004 14:11:08 +0100 + ngircd (0.7.6-0ab1) unstable; urgency=medium * New upstream version. Index: doc/Protocol.txt =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/doc/Protocol.txt,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -r1.9.2.1 -r1.9.2.2 --- doc/Protocol.txt 29 Apr 2003 13:42:24 -0000 1.9.2.1 +++ doc/Protocol.txt 8 Dec 2003 14:24:13 -0000 1.9.2.2 @@ -22,9 +22,10 @@ replacement for this server ("ircd") it tries to emulate these differences. If you don't like this behavior please ./configure the ngIRCd using the -"--enable-strict-rfc" command line option. But please note: not all IRC -clients are compatible with such an server, some can't even connect at all! -Therefore this option isn't desired for "normal operation". +"--enable-strict-rfc" command line option. But keep in mind: not all IRC +clients are compatible with a server configured that way, some can't even +connect at all! Therefore this option usually isn't desired for "normal +server operation". II. The IRC+ Protocol @@ -35,8 +36,8 @@ backwards compatible to the "plain" IRC protocol and will only be used by the ngIRCd if it detects that the peer supports it as well. -The "PASSV" command is used to detect the protocol and peer versions (see -RFC 2813, section 4.1.1). +The "PASS" command is used to detect the protocol and peer versions see +RFC 2813 (section 4.1.1) and below. II.1 Register new server link @@ -57,9 +58,11 @@ version number. Servers supporting the IRC+ protocol as defined in this document provide the string "-IRC+" here. +Example for : "0210-IRC+". + consists of two parts separated with the character "|" and is at most 100 bytes long. The first part contains the name of the implementation -(ngIRCd sets this to "ngIRCd", the original ircd to "IRC", e.g.). The second +(ngIRCd sets this to "ngircd", the original ircd to "IRC", e.g.). The second part is implementation-dependent and should only be parsed if the peer supports the IRC+ protocol as well. In this case the following syntax is used: "[:]". @@ -68,15 +71,19 @@ number, indicates the supported IRC+ protocol extensions (and may be empty!). -The optional parameter is used to propagate server options as -defined in RFC 2813, section 4.1.1. - The following are defined at the moment: +- C: The server supports the CHANINFO command. + - o: IRC operators are allowed to change channel- and channel-user-modes even if they aren't channel-operator of the affected channel. -- C: The server supports the CHANINFO command. +- Z: Compressed server links are supported by the server. + +Example for a complete string: "ngircd|0.7.5:CZ". + +The optional parameter is used to propagate server options as +defined in RFC 2813, section 4.1.1. II.2 Exchange channel-modes, topics, and persistent channels @@ -104,4 +111,4 @@ -- -$Id: Protocol.txt,v 1.9.2.1 2003/04/29 13:42:24 alex Exp $ +$Id: Protocol.txt,v 1.9.2.2 2003/12/08 14:24:13 alex Exp $ Index: doc/sample-ngircd.conf =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/doc/sample-ngircd.conf,v retrieving revision 1.20.2.3 retrieving revision 1.20.2.4 diff -u -r1.20.2.3 -r1.20.2.4 --- doc/sample-ngircd.conf 7 Nov 2003 20:51:09 -0000 1.20.2.3 +++ doc/sample-ngircd.conf 19 Dec 2003 14:30:49 -0000 1.20.2.4 @@ -1,13 +1,13 @@ -# $Id: sample-ngircd.conf,v 1.20.2.3 2003/11/07 20:51:09 alex Exp $ +# $Id: sample-ngircd.conf,v 1.20.2.4 2003/12/19 14:30:49 alex Exp $ # -# This is a sample configuration file for the ngIRCd, which must adept to -# the local preferences and needs. +# This is a sample configuration file for the ngIRCd, which must be adepted +# to the local preferences and needs. # # Comments are started with "#" or ";". # -# Author: Alexander Barton, -# Initial translation by Ilja Osthoff, +# Use "ngircd --configtest" (see manual page ngircd(8)) to validate that the +# server interpreted the configuration file as expected! # [Global] @@ -17,7 +17,7 @@ # on which the server should be listening. # Server name in the IRC network, must contain at least one dot - # (".") and be unique in the IRC network. + # (".") and be unique in the IRC network. Required! Name = irc.the.net # Info text of the server. This will be shown by WHOIS and @@ -28,7 +28,7 @@ ;Password = abc # Information about the server and the administrator, used by the - # ADMIN command. + # ADMIN command. Not required by server but by RFC! ;AdminInfo1 = Description ;AdminInfo2 = Location ;AdminEMail = admin@irc.server Index: src/ngircd/conf.c =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/conf.c,v retrieving revision 1.57.2.3 retrieving revision 1.57.2.4 diff -u -r1.57.2.3 -r1.57.2.4 --- src/ngircd/conf.c 7 Nov 2003 20:51:10 -0000 1.57.2.3 +++ src/ngircd/conf.c 19 Dec 2003 14:30:49 -0000 1.57.2.4 @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conf.c,v 1.57.2.3 2003/11/07 20:51:10 alex Exp $"; +static char UNUSED id[] = "$Id: conf.c,v 1.57.2.4 2003/12/19 14:30:49 alex Exp $"; #include "imp.h" #include @@ -854,7 +854,7 @@ if( ! Conf_ServerName[0] ) { /* No server name configured! */ - Config_Error( LOG_ALERT, "No server name configured in \"%s\" ('ServerName')!", NGIRCd_ConfFile ); + Config_Error( LOG_ALERT, "No server name configured in \"%s\" (section 'Global': 'Name')!", NGIRCd_ConfFile ); if( ! Configtest ) { Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); @@ -862,10 +862,10 @@ } } - if( ! strchr( Conf_ServerName, '.' )) + if( Conf_ServerName[0] && ! strchr( Conf_ServerName, '.' )) { /* No dot in server name! */ - Config_Error( LOG_ALERT, "Invalid server name configured in \"%s\" ('ServerName'): Dot missing!", NGIRCd_ConfFile ); + Config_Error( LOG_ALERT, "Invalid server name configured in \"%s\" (section 'Global': 'Name'): Dot missing!", NGIRCd_ConfFile ); if( ! Configtest ) { Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); Index: src/ngircd/conn-func.c =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/conn-func.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- src/ngircd/conn-func.c 7 Nov 2003 20:51:11 -0000 1.1.2.1 +++ src/ngircd/conn-func.c 26 Dec 2003 16:16:48 -0000 1.1.2.2 @@ -16,7 +16,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conn-func.c,v 1.1.2.1 2003/11/07 20:51:11 alex Exp $"; +static char UNUSED id[] = "$Id: conn-func.c,v 1.1.2.2 2003/12/26 16:16:48 alex Exp $"; #include "imp.h" #include @@ -198,7 +198,7 @@ /* Laenge der Daten im Schreibbuffer liefern */ assert( Idx > NONE ); -#ifdef USE_ZLIB +#ifdef ZLIB if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.wdatalen; else #endif @@ -232,7 +232,7 @@ /* Laenge der Daten im Lesebuffer liefern */ assert( Idx > NONE ); -#ifdef USE_ZLIB +#ifdef ZLIB if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.rdatalen; else #endif Index: src/ngircd/conn-zip.c =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/conn-zip.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- src/ngircd/conn-zip.c 21 Apr 2003 10:52:26 -0000 1.3 +++ src/ngircd/conn-zip.c 26 Dec 2003 16:16:48 -0000 1.3.2.1 @@ -17,9 +17,9 @@ #define CONN_MODULE -#ifdef USE_ZLIB +#ifdef ZLIB -static char UNUSED id[] = "$Id: conn-zip.c,v 1.3 2003/04/21 10:52:26 alex Exp $"; +static char UNUSED id[] = "$Id: conn-zip.c,v 1.3.2.1 2003/12/26 16:16:48 alex Exp $"; #include "imp.h" #include Index: src/ngircd/conn-zip.h =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/conn-zip.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- src/ngircd/conn-zip.h 30 Dec 2002 16:07:23 -0000 1.1 +++ src/ngircd/conn-zip.h 26 Dec 2003 16:16:48 -0000 1.1.2.1 @@ -8,13 +8,13 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: conn-zip.h,v 1.1 2002/12/30 16:07:23 alex Exp $ + * $Id: conn-zip.h,v 1.1.2.1 2003/12/26 16:16:48 alex Exp $ * * Connection compression using ZLIB (header) */ -#ifdef USE_ZLIB +#ifdef ZLIB #ifndef __conn_zip_h__ #define __conn_zip_h__ @@ -32,7 +32,7 @@ #endif /* __conn_zip_h__ */ -#endif /* USE_ZLIB */ +#endif /* ZLIB */ /* -eof- */ Index: src/ngircd/conn.c =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/conn.c,v retrieving revision 1.122.2.2 retrieving revision 1.122.2.4 diff -u -r1.122.2.2 -r1.122.2.4 --- src/ngircd/conn.c 7 Nov 2003 20:51:11 -0000 1.122.2.2 +++ src/ngircd/conn.c 3 Feb 2004 13:54:36 -0000 1.122.2.4 @@ -16,7 +16,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conn.c,v 1.122.2.2 2003/11/07 20:51:11 alex Exp $"; +static char UNUSED id[] = "$Id: conn.c,v 1.122.2.4 2004/02/03 13:54:36 alex Exp $"; #include "imp.h" #include @@ -43,7 +43,7 @@ #include /* e.g. for Mac OS X */ #endif -#ifdef USE_TCPWRAP +#ifdef TCPWRAP #include /* for TCP Wrappers */ #endif @@ -93,7 +93,7 @@ LOCAL fd_set My_Sockets; LOCAL fd_set My_Connects; -#ifdef USE_TCPWRAP +#ifdef TCPWRAP INT allow_severity = LOG_INFO; INT deny_severity = LOG_ERR; #endif @@ -395,7 +395,7 @@ FD_ZERO( &write_sockets ); for( i = 0; i < Pool_Size; i++ ) { -#ifdef USE_ZLIB +#ifdef ZLIB if(( My_Connections[i].sock > NONE ) && (( My_Connections[i].wdatalen > 0 ) || ( My_Connections[i].zip.wdatalen > 0 ))) #else if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].wdatalen > 0 )) @@ -581,7 +581,7 @@ } } -#ifdef USE_ZLIB +#ifdef ZLIB if( My_Connections[Idx].options & CONN_ZIP ) { /* Daten komprimieren und in Puffer kopieren */ @@ -611,7 +611,7 @@ CLIENT *c; DOUBLE in_k, out_k; -#ifdef USE_ZLIB +#ifdef ZLIB DOUBLE in_z_k, out_z_k; INT in_p, out_p; #endif @@ -673,7 +673,7 @@ /* Calculate statistics and log information */ in_k = (DOUBLE)My_Connections[Idx].bytes_in / 1024; out_k = (DOUBLE)My_Connections[Idx].bytes_out / 1024; -#ifdef USE_ZLIB +#ifdef ZLIB if( My_Connections[Idx].options & CONN_ZIP ) { in_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_in / 1024; @@ -701,7 +701,7 @@ /* Servers: Modify time of next connect attempt? */ Conf_UnsetServer( Idx ); -#ifdef USE_ZLIB +#ifdef ZLIB /* Clean up zlib, if link was compressed */ if( Conn_Options( Idx ) & CONN_ZIP ) { @@ -762,7 +762,7 @@ assert( My_Connections[Idx].sock > NONE ); /* sind ueberhaupt Daten vorhanden? */ -#ifdef USE_ZLIB +#ifdef ZLIB if(( ! My_Connections[Idx].wdatalen > 0 ) && ( ! My_Connections[Idx].zip.wdatalen )) return TRUE; #else if( ! My_Connections[Idx].wdatalen > 0 ) return TRUE; @@ -877,7 +877,7 @@ return Conn_WriteStr( Idx, "SERVER %s :%s", Conf_ServerName, Conf_ServerInfo ); } -#ifdef USE_ZLIB +#ifdef ZLIB /* Schreibpuffer leer, aber noch Daten im Kompressionsbuffer? * Dann muss dieser nun geflushed werden! */ if( My_Connections[Idx].wdatalen == 0 ) Zip_Flush( Idx ); @@ -912,7 +912,7 @@ /* Neue Client-Verbindung von Listen-Socket annehmen und * CLIENT-Struktur anlegen. */ -#ifdef USE_TCPWRAP +#ifdef TCPWRAP struct request_info req; #endif struct sockaddr_in new_addr; @@ -934,9 +934,10 @@ return; } -#ifdef USE_TCPWRAP +#ifdef TCPWRAP /* Validate socket using TCP Wrappers */ request_init( &req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL ); + fromhost(&req); if( ! hosts_access( &req )) { /* Access denied! */ @@ -1097,7 +1098,7 @@ * Tritt ein Fehler auf, so wird der Socket geschlossen. */ INT len, bsize; -#ifdef USE_ZLIB +#ifdef ZLIB CLIENT *c; #endif @@ -1107,12 +1108,12 @@ /* wenn noch nicht registriert: maximal mit ZREADBUFFER_LEN arbeiten, * ansonsten koennen Daten ggf. nicht umkopiert werden. */ bsize = READBUFFER_LEN; -#ifdef USE_ZLIB +#ifdef ZLIB c = Client_GetFromConn( Idx ); if(( Client_Type( c ) != CLIENT_USER ) && ( Client_Type( c ) != CLIENT_SERVER ) && ( Client_Type( c ) != CLIENT_SERVICE ) && ( bsize > ZREADBUFFER_LEN )) bsize = ZREADBUFFER_LEN; #endif -#ifdef USE_ZLIB +#ifdef ZLIB if(( bsize - My_Connections[Idx].rdatalen - 1 < 1 ) || ( ZREADBUFFER_LEN - My_Connections[Idx].zip.rdatalen < 1 )) #else if( bsize - My_Connections[Idx].rdatalen - 1 < 1 ) @@ -1124,7 +1125,7 @@ return; } -#ifdef USE_ZLIB +#ifdef ZLIB if( My_Connections[Idx].options & CONN_ZIP ) { len = recv( My_Connections[Idx].sock, My_Connections[Idx].zip.rbuf + My_Connections[Idx].zip.rdatalen, ( ZREADBUFFER_LEN - My_Connections[Idx].zip.rdatalen ), 0 ); @@ -1179,7 +1180,7 @@ CHAR *ptr; INT len, delta; BOOLEAN action, result; -#ifdef USE_ZLIB +#ifdef ZLIB BOOLEAN old_z; #endif @@ -1189,7 +1190,7 @@ /* Check penalty */ if( My_Connections[Idx].delaytime > time( NULL )) return result; -#ifdef USE_ZLIB +#ifdef ZLIB /* ggf. noch unkomprimiete Daten weiter entpacken */ if( My_Connections[Idx].options & CONN_ZIP ) { @@ -1235,7 +1236,7 @@ return FALSE; } -#ifdef USE_ZLIB +#ifdef ZLIB /* merken, ob Stream bereits komprimiert wird */ old_z = My_Connections[Idx].options & CONN_ZIP; #endif @@ -1252,7 +1253,7 @@ My_Connections[Idx].rdatalen -= len; memmove( My_Connections[Idx].rbuf, My_Connections[Idx].rbuf + len, My_Connections[Idx].rdatalen ); -#ifdef USE_ZLIB +#ifdef ZLIB if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) && ( My_Connections[Idx].rdatalen > 0 )) { /* Mit dem letzten Befehl wurde Socket-Kompression aktiviert. @@ -1531,7 +1532,7 @@ My_Connections[Idx].flag = 0; My_Connections[Idx].options = 0; -#ifdef USE_ZLIB +#ifdef ZLIB My_Connections[Idx].zip.rbuf[0] = '\0'; My_Connections[Idx].zip.rdatalen = 0; My_Connections[Idx].zip.wbuf[0] = '\0'; Index: src/ngircd/conn.h =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/conn.h,v retrieving revision 1.31 retrieving revision 1.31.2.1 diff -u -r1.31 -r1.31.2.1 --- src/ngircd/conn.h 27 Mar 2003 01:20:22 -0000 1.31 +++ src/ngircd/conn.h 26 Dec 2003 16:16:48 -0000 1.31.2.1 @@ -8,7 +8,7 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: conn.h,v 1.31 2003/03/27 01:20:22 alex Exp $ + * $Id: conn.h,v 1.31.2.1 2003/12/26 16:16:48 alex Exp $ * * Connection management (header) */ @@ -23,7 +23,7 @@ #define CONN_ISCLOSING 1 /* Conn_Close() already called */ -#ifdef USE_ZLIB +#ifdef ZLIB #define CONN_ZIP 2 /* zlib compressed link */ #endif @@ -36,7 +36,7 @@ #include "defines.h" #include "resolve.h" -#ifdef USE_ZLIB +#ifdef ZLIB #include typedef struct _ZipData { @@ -48,7 +48,7 @@ INT wdatalen; /* Length of data in write buffer (uncompressed) */ LONG bytes_in, bytes_out; /* Counter for statistics (uncompressed!) */ } ZIPDATA; -#endif /* USE_ZLIB */ +#endif /* ZLIB */ typedef struct _Connection { @@ -69,9 +69,9 @@ LONG msg_in, msg_out; /* Received and sent IRC messages */ INT flag; /* Flag (see "irc-write" module) */ INT options; /* Link options */ -#ifdef USE_ZLIB +#ifdef ZLIB ZIPDATA zip; /* Compression information */ -#endif /* USE_ZLIB */ +#endif /* ZLIB */ } CONNECTION; GLOBAL CONNECTION *My_Connections; Index: src/ngircd/defines.h =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/defines.h,v retrieving revision 1.42.2.1 retrieving revision 1.42.2.2 diff -u -r1.42.2.1 -r1.42.2.2 --- src/ngircd/defines.h 7 Nov 2003 20:51:11 -0000 1.42.2.1 +++ src/ngircd/defines.h 26 Dec 2003 16:16:48 -0000 1.42.2.2 @@ -8,7 +8,7 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: defines.h,v 1.42.2.1 2003/11/07 20:51:11 alex Exp $ + * $Id: defines.h,v 1.42.2.2 2003/12/26 16:16:48 alex Exp $ * * Global defines of ngIRCd. */ @@ -57,7 +57,7 @@ #define READBUFFER_LEN 2048 /* Laenge des Lesepuffers je Verbindung (Bytes) */ #define WRITEBUFFER_LEN 4096 /* Laenge des Schreibpuffers je Verbindung (Bytes) */ -#ifdef USE_ZLIB +#ifdef ZLIB #define ZREADBUFFER_LEN 1024 /* Laenge des Lesepuffers je Verbindung (Bytes) */ #define ZWRITEBUFFER_LEN 4096 /* Laenge des Schreibpuffers fuer Kompression (Bytes) */ #endif Index: src/ngircd/irc-info.c =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/irc-info.c,v retrieving revision 1.16.2.3 retrieving revision 1.16.2.4 diff -u -r1.16.2.3 -r1.16.2.4 --- src/ngircd/irc-info.c 4 Dec 2003 14:13:42 -0000 1.16.2.3 +++ src/ngircd/irc-info.c 26 Dec 2003 16:16:48 -0000 1.16.2.4 @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-info.c,v 1.16.2.3 2003/12/04 14:13:42 alex Exp $"; +static char UNUSED id[] = "$Id: irc-info.c,v 1.16.2.4 2003/12/26 16:16:48 alex Exp $"; #include "imp.h" #include @@ -379,7 +379,7 @@ if( cl && (( Client_Type( cl ) == CLIENT_SERVER ) || ( cl == Client ))) { /* Server link or our own connection */ -#ifdef USE_ZLIB +#ifdef ZLIB if( Conn_Options( con ) & CONN_ZIP ) { if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFOZIP_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Zip_SendBytes( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Zip_RecvBytes( con ), Conn_RecvBytes( con ), (LONG)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED; Index: src/ngircd/irc-login.c =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/irc-login.c,v retrieving revision 1.34.2.2 retrieving revision 1.34.2.3 diff -u -r1.34.2.2 -r1.34.2.3 --- src/ngircd/irc-login.c 4 Dec 2003 14:13:42 -0000 1.34.2.2 +++ src/ngircd/irc-login.c 4 Feb 2004 20:04:54 -0000 1.34.2.3 @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-login.c,v 1.34.2.2 2003/12/04 14:13:42 alex Exp $"; +static char UNUSED id[] = "$Id: irc-login.c,v 1.34.2.3 2004/02/04 20:04:54 alex Exp $"; #include "imp.h" #include @@ -294,11 +294,17 @@ if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS ) #endif { - /* Falsche Anzahl Parameter? */ + /* Wrong number of parameters? */ if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* User name */ Client_SetUser( Client, Req->argv[0], FALSE ); - Client_SetInfo( Client, Req->argv[3] ); + + /* "Real name" or user info text: Don't set it to the empty + * string, the original ircd can't deal with such "real names" + * (e. g. "USER user * * :") ... */ + if( *Req->argv[3] ) Client_SetInfo( Client, Req->argv[3] ); + else Client_SetInfo( Client, "-" ); Log( LOG_DEBUG, "Connection %d: got valid USER command ...", Client_Conn( Client )); if( Client_Type( Client ) == CLIENT_GOTNICK ) return Hello_User( Client ); Index: src/ngircd/irc-server.c =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/irc-server.c,v retrieving revision 1.32.2.1 retrieving revision 1.32.2.2 diff -u -r1.32.2.1 -r1.32.2.2 --- src/ngircd/irc-server.c 9 Jul 2003 18:53:08 -0000 1.32.2.1 +++ src/ngircd/irc-server.c 26 Dec 2003 16:16:48 -0000 1.32.2.2 @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-server.c,v 1.32.2.1 2003/07/09 18:53:08 alex Exp $"; +static char UNUSED id[] = "$Id: irc-server.c,v 1.32.2.2 2003/12/26 16:16:48 alex Exp $"; #include "imp.h" #include @@ -117,7 +117,7 @@ Client_SetType( Client, CLIENT_SERVER ); Conf_SetServer( i, con ); -#ifdef USE_ZLIB +#ifdef ZLIB /* Kompression initialisieren, wenn erforderlich */ if( strchr( Client_Flags( Client ), 'Z' )) { Index: src/ngircd/irc.c =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/irc.c,v retrieving revision 1.120.2.2 retrieving revision 1.120.2.3 diff -u -r1.120.2.2 -r1.120.2.3 --- src/ngircd/irc.c 7 Nov 2003 20:51:11 -0000 1.120.2.2 +++ src/ngircd/irc.c 26 Dec 2003 16:16:48 -0000 1.120.2.3 @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc.c,v 1.120.2.2 2003/11/07 20:51:11 alex Exp $"; +static char UNUSED id[] = "$Id: irc.c,v 1.120.2.3 2003/12/26 16:16:48 alex Exp $"; #include "imp.h" #include @@ -302,7 +302,7 @@ options = Conn_Options( Idx ); strcpy( option_txt, "F" ); /* No idea what this means but the original ircd sends it ... */ -#ifdef USE_ZLIB +#ifdef ZLIB if( options & CONN_ZIP ) strcat( option_txt, "z" ); #endif Index: src/ngircd/log.c =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/log.c,v retrieving revision 1.43 retrieving revision 1.43.2.1 diff -u -r1.43 -r1.43.2.1 --- src/ngircd/log.c 31 Mar 2003 15:54:21 -0000 1.43 +++ src/ngircd/log.c 26 Dec 2003 16:16:48 -0000 1.43.2.1 @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: log.c,v 1.43 2003/03/31 15:54:21 alex Exp $"; +static char UNUSED id[] = "$Id: log.c,v 1.43.2.1 2003/12/26 16:16:48 alex Exp $"; #include "imp.h" #include @@ -25,7 +25,7 @@ #include #include -#ifdef USE_SYSLOG +#ifdef SYSLOG #include #endif @@ -50,7 +50,7 @@ GLOBAL VOID Log_Init( VOID ) { -#ifdef USE_SYSLOG +#ifdef SYSLOG /* Syslog initialisieren */ openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 ); #endif @@ -125,7 +125,7 @@ /* Error-File (stderr) loeschen */ if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno )); -#ifdef USE_SYSLOG +#ifdef SYSLOG /* syslog abmelden */ closelog( ); #endif @@ -180,7 +180,7 @@ fprintf( stdout, "[%d] %s\n", Level, msg ); fflush( stdout ); } -#ifdef USE_SYSLOG +#ifdef SYSLOG else { /* Syslog */ @@ -206,7 +206,7 @@ GLOBAL VOID Log_Init_Resolver( VOID ) { -#ifdef USE_SYSLOG +#ifdef SYSLOG openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 ); #endif } /* Log_Init_Resolver */ @@ -215,7 +215,7 @@ GLOBAL VOID Log_Exit_Resolver( VOID ) { -#ifdef USE_SYSLOG +#ifdef SYSLOG closelog( ); #endif } /* Log_Exit_Resolver */ @@ -234,7 +234,7 @@ { /* Eintrag des Resolver in Logfile(s) schreiben */ -#ifndef USE_SYSLOG +#ifndef SYSLOG return; #else Index: src/ngircd/log.h =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/log.h,v retrieving revision 1.13 retrieving revision 1.13.4.1 diff -u -r1.13 -r1.13.4.1 --- src/ngircd/log.h 12 Dec 2002 12:23:43 -0000 1.13 +++ src/ngircd/log.h 26 Dec 2003 16:16:48 -0000 1.13.4.1 @@ -8,7 +8,7 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: log.h,v 1.13 2002/12/12 12:23:43 alex Exp $ + * $Id: log.h,v 1.13.4.1 2003/12/26 16:16:48 alex Exp $ * * Logging functions (header) */ @@ -18,7 +18,7 @@ #define __log_h__ -#ifdef USE_SYSLOG +#ifdef SYSLOG # include #else # define LOG_EMERG 0 Index: src/ngircd/messages.h =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/messages.h,v retrieving revision 1.64 retrieving revision 1.64.2.1 diff -u -r1.64 -r1.64.2.1 --- src/ngircd/messages.h 19 Mar 2003 21:16:16 -0000 1.64 +++ src/ngircd/messages.h 26 Dec 2003 16:16:48 -0000 1.64.2.1 @@ -8,7 +8,7 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: messages.h,v 1.64 2003/03/19 21:16:16 alex Exp $ + * $Id: messages.h,v 1.64.2.1 2003/12/26 16:16:48 alex Exp $ * * IRC numerics (Header) */ @@ -117,7 +117,7 @@ #define ERR_UMODEUNKNOWNFLAG2_MSG "501 %s :Unknown mode \"%c%c\"" #define ERR_USERSDONTMATCH_MSG "502 %s :Can't set/get mode for other users" -#ifdef USE_ZLIB +#ifdef ZLIB #define RPL_STATSLINKINFOZIP_MSG "211 %s %s %d %ld %ld/%ld %ld %ld/%ld :%ld" #endif Index: src/ngircd/ngircd.c =================================================================== RCS file: /usr/local/CVS/ngircd/ngircd/src/ngircd/ngircd.c,v retrieving revision 1.76.2.1 retrieving revision 1.76.2.3 diff -u -r1.76.2.1 -r1.76.2.3 --- src/ngircd/ngircd.c 18 Jul 2003 20:50:05 -0000 1.76.2.1 +++ src/ngircd/ngircd.c 2 Jan 2004 19:24:46 -0000 1.76.2.3 @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2004 by Alexander Barton (alex@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 @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: ngircd.c,v 1.76.2.1 2003/07/18 20:50:05 alex Exp $"; +static char UNUSED id[] = "$Id: ngircd.c,v 1.76.2.3 2004/01/02 19:24:46 alex Exp $"; #include "imp.h" #include @@ -298,7 +298,7 @@ * sind in doc/Protocol.txt beschrieben. */ #ifdef IRCPLUS sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS ); -#ifdef USE_ZLIB +#ifdef ZLIB strcat( NGIRCd_ProtoID, "Z" ); #endif if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" ); @@ -306,7 +306,7 @@ sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION ); #endif strcat( NGIRCd_ProtoID, " P" ); -#ifdef USE_ZLIB +#ifdef ZLIB strcat( NGIRCd_ProtoID, "Z" ); #endif Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID ); @@ -361,15 +361,15 @@ strcpy( txt, "" ); -#ifdef USE_SYSLOG +#ifdef SYSLOG if( txt[0] ) strcat( txt, "+" ); strcat( txt, "SYSLOG" ); #endif -#ifdef USE_ZLIB +#ifdef ZLIB if( txt[0] ) strcat( txt, "+" ); strcat( txt, "ZLIB" ); #endif -#ifdef USE_TCPWRAP +#ifdef TCPWRAP if( txt[0] ) strcat( txt, "+" ); strcat( txt, "TCPWRAP" ); #endif @@ -529,7 +529,7 @@ Show_Version( VOID ) { puts( NGIRCd_Version( )); - puts( "Copyright (c)2001-2003 by Alexander Barton ()." ); + puts( "Copyright (c)2001-2004 by Alexander Barton ()." ); puts( "Homepage: \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." );