X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=3370b8a6e6fed6dd1686c362c725cdbb0612f72c;hp=37cc97fc5d97fe71809f292cd06af1c3393efc59;hb=1d8cb34bc88c8891a1d6a7c3a78ff78909e9f8bf;hpb=e311cc0140b2edff3927ce9b2117d328735445ec

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 37cc97fc..3370b8a6 100644
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: ngircd.c,v 1.60 2002/11/22 17:59:43 alex Exp $
+ * $Id: ngircd.c,v 1.62 2002/11/26 23:07:24 alex Exp $
  *
  * ngircd.c: Hier beginnt alles ;-)
  */
@@ -294,11 +294,17 @@ 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, VERSION, IRCPLUSFLAGS );
+#ifdef USE_ZLIB
+		strcat( NGIRCd_ProtoID, "Z" );
+#endif
 		if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" );
 #else
 		sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE, VERSION );
 #endif
 		strcat( NGIRCd_ProtoID, " P" );
+#ifdef USE_ZLIB
+		strcat( NGIRCd_ProtoID, "Z" );
+#endif
 		Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID );
 
 		/* Vordefinierte Channels anlegen */
@@ -352,6 +358,10 @@ NGIRCd_VersionAddition( VOID )
 	if( txt[0] ) strcat( txt, "+" );
 	strcat( txt, "SYSLOG" );
 #endif
+#ifdef USE_ZLIB
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "ZLIB" );
+#endif
 #ifdef DEBUG
 	if( txt[0] ) strcat( txt, "+" );
 	strcat( txt, "DEBUG" );
@@ -381,7 +391,7 @@ NGIRCd_VersionAddition( VOID )
 
 
 GLOBAL VOID
-NGIRCd_Reload( VOID )
+NGIRCd_Rehash( VOID )
 {
 	CHAR old_name[CLIENT_ID_LEN];
 	
@@ -409,7 +419,7 @@ NGIRCd_Reload( VOID )
 	Conn_InitListeners( );
 
 	Log( LOG_INFO, "Re-reading of configuration done." );
-} /* NGIRCd_Reload */
+} /* NGIRCd_Rehash */
 
 
 LOCAL VOID
@@ -480,7 +490,7 @@ Signal_Handler( INT Signal )
 		case SIGHUP:
 			/* Konfiguration neu einlesen: */
 			Log( LOG_WARNING|LOG_snotice, "Got HUP signal, re-reading configuration ..." );
-			NGIRCd_Reload( );
+			NGIRCd_Rehash( );
 			break;
 		case SIGCHLD:
 			/* Child-Prozess wurde beendet. Zombies vermeiden: */