Added new short command line option "-t" as alternative to "--configtest".

[ngircd-alex.git] / src / ngircd / ngircd.c

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 046ff959857295634ad163df308f3b7449ba74f6..dc16758d9ee2682eef6db96dacae6d4707631e5a 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: ngircd.c,v 1.76 2003/03/31 15:54:21 alex Exp $";
+static char UNUSED id[] = "$Id: ngircd.c,v 1.80 2003/12/29 14:53:26 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -183,6 +183,11 @@ main( int argc, const char *argv[] )
                                        ok = TRUE;
                                }
 #endif
+                               if( argv[i][n] == 't' )
+                               {
+                                       configtest = TRUE;
+                                       ok = TRUE;
+                               }
 
                                if( ! ok )
                                {
@@ -298,7 +303,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 +311,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 +366,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
@@ -377,6 +382,10 @@ NGIRCd_VersionAddition( VOID )
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "RENDEZVOUS" );
 #endif
+#ifdef IDENTAUTH
+       if( txt[0] ) strcat( txt, "+" );
+       strcat( txt, "IDENT" );
+#endif
 #ifdef DEBUG
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "DEBUG" );
@@ -417,7 +426,9 @@ NGIRCd_Rehash( VOID )
        Conn_ExitListeners( );
 
        /* Alten Server-Namen merken */
+#ifdef DEBUG
        assert( sizeof( old_name ) == sizeof( Conf_ServerName ));
+#endif
        strcpy( old_name, Conf_ServerName );
 
        /* Konfiguration neu lesen ... */
@@ -546,7 +557,7 @@ Show_Help( VOID )
 #ifdef SNIFFER
        puts( "  -s, --sniffer      enable network sniffer and display all IRC traffic" );
 #endif
-       puts( "      --configtest   read, validate and display configuration; then exit" );
+       puts( "  -t, --configtest   read, validate and display configuration; then exit" );
        puts( "      --version      output version information and exit" );
        puts( "      --help         display this help and exit" );
 } /* Show_Help */