commit c40592d2cef21dd255af978644eb96c330913be7 from: Alexander Barton date: Fri Dec 26 15:55:07 2003 UTC Removed "USE_" prefixes of configuration #defines. commit - 05170bc94cc3c200da0b973b3cf1a44635e64611 commit + c40592d2cef21dd255af978644eb96c330913be7 blob - 2dd730783ec054de126c91ff7a668ed42748629b blob + 84e8a6510127fb4d97b75654fe7dab9fcb78544b --- ChangeLog +++ ChangeLog @@ -8,7 +8,11 @@ terms of the GNU General Public License. -- ChangeLog -- + + +ngIRCd CVSHEAD + - Removed "USE_" prefixes of configuration #defines. ngIRCd 0.7.6 (2003-12-05) @@ -484,4 +488,4 @@ ngIRCd 0.0.1, 31.12.2001 -- -$Id: ChangeLog,v 1.218 2003/12/05 13:40:44 alex Exp $ +$Id: ChangeLog,v 1.219 2003/12/26 15:55:07 alex Exp $ blob - 23c8984beb304a831bda641d8f490989dd6d4d4d blob + 43d5734302ee76745e1697154c930061df97f7b6 --- configure.in +++ configure.in @@ -8,7 +8,7 @@ # (at your option) any later version. # Please read the file COPYING, README and AUTHORS for more information. # -# $Id: configure.in,v 1.96 2003/11/04 00:41:07 alex Exp $ +# $Id: configure.in,v 1.97 2003/12/26 15:55:07 alex Exp $ # # -- Initialisierung -- @@ -26,9 +26,9 @@ AH_TEMPLATE([DEBUG], [Define if debug-mode should be e 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 @@ AC_ARG_WITH(syslog, ] ) 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 @@ AC_ARG_WITH(zlib, ] ) 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 @@ AC_ARG_WITH(tcp-wrappers, ptr = hosts_access; ],[ AC_MSG_RESULT(yes) - AC_DEFINE(USE_TCPWRAP, 1) + AC_DEFINE(TCPWRAP, 1) x_tcpwrap_on=yes ],[ AC_MSG_RESULT(no) blob - 591804b1910aafa565ade56f2a09e9b2ba47ad97 blob + 06b5b9847ff055787dcbe6f5eebffc60604e0f02 --- src/ngircd/conn-func.c +++ src/ngircd/conn-func.c @@ -16,7 +16,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conn-func.c,v 1.2 2003/11/05 23:24:48 alex Exp $"; +static char UNUSED id[] = "$Id: conn-func.c,v 1.3 2003/12/26 15:55:07 alex Exp $"; #include "imp.h" #include @@ -198,7 +198,7 @@ Conn_SendQ( CONN_ID Idx ) /* 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 @@ Conn_RecvQ( CONN_ID Idx ) /* 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 blob - 02a3c25366900892a5bcd41a44671923ec80c81c blob + e1a2d41522c3d33e036f5b114f950a867160a680 --- src/ngircd/conn-zip.c +++ src/ngircd/conn-zip.c @@ -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.4 2003/12/26 15:55:07 alex Exp $"; #include "imp.h" #include blob - e00bffefcca6da3031a6c5f96b246c4c9c447a54 blob + e2ff93f6b44e8f868f29addc2d5d327cc2840c30 --- src/ngircd/conn-zip.h +++ src/ngircd/conn-zip.h @@ -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.2 2003/12/26 15:55:07 alex Exp $ * * Connection compression using ZLIB (header) */ -#ifdef USE_ZLIB +#ifdef ZLIB #ifndef __conn_zip_h__ #define __conn_zip_h__ @@ -32,7 +32,7 @@ GLOBAL LONG Zip_RecvBytes PARAMS(( CONN_ID Idx )); #endif /* __conn_zip_h__ */ -#endif /* USE_ZLIB */ +#endif /* ZLIB */ /* -eof- */ blob - 317171ea1ddb3e833f592238beb9fc0ac321c0f0 blob + 48c1f46841f9d364199eaffaf947b330ff33e209 --- src/ngircd/conn.c +++ src/ngircd/conn.c @@ -16,7 +16,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conn.c,v 1.127 2003/11/05 23:24:48 alex Exp $"; +static char UNUSED id[] = "$Id: conn.c,v 1.128 2003/12/26 15:55:07 alex Exp $"; #include "imp.h" #include @@ -43,7 +43,7 @@ static char UNUSED id[] = "$Id: conn.c,v 1.127 2003/11 #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_Listeners; 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 @@ Conn_Handler( VOID ) 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 @@ Conn_Write( CONN_ID Idx, CHAR *Data, INT Len ) } } -#ifdef USE_ZLIB +#ifdef ZLIB if( My_Connections[Idx].options & CONN_ZIP ) { /* Daten komprimieren und in Puffer kopieren */ @@ -611,7 +611,7 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, B 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 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, B /* 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 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, B /* 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 @@ Try_Write( CONN_ID Idx ) 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 @@ Handle_Write( CONN_ID Idx ) 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 @@ New_Connection( INT Sock ) /* 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,7 +934,7 @@ New_Connection( INT Sock ) 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 ); if( ! hosts_access( &req )) @@ -1097,7 +1097,7 @@ Read_Request( CONN_ID Idx ) * Tritt ein Fehler auf, so wird der Socket geschlossen. */ INT len, bsize; -#ifdef USE_ZLIB +#ifdef ZLIB CLIENT *c; #endif @@ -1107,12 +1107,12 @@ Read_Request( CONN_ID Idx ) /* 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 +1124,7 @@ Read_Request( CONN_ID Idx ) 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 +1179,7 @@ Handle_Buffer( CONN_ID Idx ) CHAR *ptr; INT len, delta; BOOLEAN action, result; -#ifdef USE_ZLIB +#ifdef ZLIB BOOLEAN old_z; #endif @@ -1189,7 +1189,7 @@ Handle_Buffer( CONN_ID Idx ) /* 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 +1235,7 @@ Handle_Buffer( CONN_ID Idx ) return FALSE; } -#ifdef USE_ZLIB +#ifdef ZLIB /* merken, ob Stream bereits komprimiert wird */ old_z = My_Connections[Idx].options & CONN_ZIP; #endif @@ -1252,7 +1252,7 @@ Handle_Buffer( CONN_ID Idx ) 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 +1531,7 @@ Init_Conn_Struct( CONN_ID Idx ) 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'; blob - ffbfe64a909d9813ebb05fc6aded31bf9cbe168f blob + 91be9d622c5cc5c3953057e6cb315b15b9612832 --- src/ngircd/conn.h +++ src/ngircd/conn.h @@ -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.32 2003/12/26 15:55:07 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 @@ typedef INT CONN_ID; #include "defines.h" #include "resolve.h" -#ifdef USE_ZLIB +#ifdef ZLIB #include typedef struct _ZipData { @@ -48,7 +48,7 @@ typedef struct _ZipData 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 @@ typedef struct _Connection 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; blob - e4865e1a762a6d9504ade6a9a288754712fff511 blob + 0dfd502a49c7943bb7a7161c231fa5bef0c4f87c --- src/ngircd/defines.h +++ src/ngircd/defines.h @@ -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.43 2003/11/05 23:24:48 alex Exp $ + * $Id: defines.h,v 1.44 2003/12/26 15:55:07 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 blob - 28ac7e9854311541d6cbfe7cfc4cae4091b54608 blob + 6d81b24f8a9e7f3d785ccb216a871228ece250f1 --- src/ngircd/irc-info.c +++ src/ngircd/irc-info.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-info.c,v 1.19 2003/12/04 14:05:16 alex Exp $"; +static char UNUSED id[] = "$Id: irc-info.c,v 1.20 2003/12/26 15:55:07 alex Exp $"; #include "imp.h" #include @@ -379,7 +379,7 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) 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; blob - 7b7340f238b201298f1dc6ba69011f5fc6acbe2c blob + 694da656d193facee62055f2fd75dbbb914b9354 --- src/ngircd/irc-server.c +++ src/ngircd/irc-server.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-server.c,v 1.33 2003/07/09 18:45:56 alex Exp $"; +static char UNUSED id[] = "$Id: irc-server.c,v 1.34 2003/12/26 15:55:07 alex Exp $"; #include "imp.h" #include @@ -117,7 +117,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Client_SetType( Client, CLIENT_SERVER ); Conf_SetServer( i, con ); -#ifdef USE_ZLIB +#ifdef ZLIB /* Kompression initialisieren, wenn erforderlich */ if( strchr( Client_Flags( Client ), 'Z' )) { blob - eb32afdd134a9988fc17a0fe7282c4d4b82236ef blob + a4355dd41ea9a75d7d0ff31fc3303fd5cdfe5d01 --- src/ngircd/irc.c +++ src/ngircd/irc.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc.c,v 1.122 2003/11/05 23:24:48 alex Exp $"; +static char UNUSED id[] = "$Id: irc.c,v 1.123 2003/12/26 15:55:07 alex Exp $"; #include "imp.h" #include @@ -302,7 +302,7 @@ Option_String( CONN_ID Idx ) 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 blob - 9e226a5ad0e7e639225d40b2c327a704e6e10df2 blob + 1c8d2c7b3e1b52ab37b6b14cb88568d63d434212 --- src/ngircd/log.c +++ src/ngircd/log.c @@ -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.44 2003/12/26 15:55:07 alex Exp $"; #include "imp.h" #include @@ -25,7 +25,7 @@ static char UNUSED id[] = "$Id: log.c,v 1.43 2003/03/3 #include #include -#ifdef USE_SYSLOG +#ifdef SYSLOG #include #endif @@ -50,7 +50,7 @@ LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg )); 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 @@ Log_Exit( VOID ) /* 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 @@ va_dcl fprintf( stdout, "[%d] %s\n", Level, msg ); fflush( stdout ); } -#ifdef USE_SYSLOG +#ifdef SYSLOG else { /* Syslog */ @@ -206,7 +206,7 @@ va_dcl 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 @@ Log_Init_Resolver( VOID ) GLOBAL VOID Log_Exit_Resolver( VOID ) { -#ifdef USE_SYSLOG +#ifdef SYSLOG closelog( ); #endif } /* Log_Exit_Resolver */ @@ -234,7 +234,7 @@ va_dcl { /* Eintrag des Resolver in Logfile(s) schreiben */ -#ifndef USE_SYSLOG +#ifndef SYSLOG return; #else blob - bc22c20027ee6bcc40b35bfb60a8aed2ada70c0b blob + 028985c44cd7ec19e4bb14e09736b3bd78e79bfc --- src/ngircd/log.h +++ src/ngircd/log.h @@ -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.14 2003/12/26 15:55:07 alex Exp $ * * Logging functions (header) */ @@ -18,7 +18,7 @@ #define __log_h__ -#ifdef USE_SYSLOG +#ifdef SYSLOG # include #else # define LOG_EMERG 0 blob - 57fde868b5cf6b815763d06ecb22a6c371df22c4 blob + 3ac479e8b6e7f454ba467b0b79c7e3c580a82550 --- src/ngircd/messages.h +++ src/ngircd/messages.h @@ -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.65 2003/12/26 15:55:07 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 blob - 313dc456df6960de53553971fe96f0de4bdfb56b blob + 8bea98ae4429a55e7d4aca54b232787d48f9a83a --- src/ngircd/ngircd.c +++ src/ngircd/ngircd.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: ngircd.c,v 1.77 2003/06/05 10:48:13 alex Exp $"; +static char UNUSED id[] = "$Id: ngircd.c,v 1.78 2003/12/26 15:55:07 alex Exp $"; #include "imp.h" #include @@ -298,7 +298,7 @@ main( int argc, const char *argv[] ) * 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 @@ main( int argc, const char *argv[] ) 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 @@ NGIRCd_VersionAddition( VOID ) 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