- Rechtschreibfehler korrigiert ;-)

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index f8c710d27100cb8b7fb48c4cb1d6f6b6f1747364..851663eb56c20e16bd3996feeeaa75331351b4ff 100644 (file)
--- 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.50 2002/09/02 19:00:25 alex Exp $
+ * $Id: ngircd.c,v 1.59 2002/11/18 18:49:34 alex Exp $
  *
  * ngircd.c: Hier beginnt alles ;-)
  */
@@ -29,12 +29,15 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <time.h>
+#include <pwd.h>
+#include <grp.h>
 
 #include "resolve.h"
 #include "conn.h"
 #include "client.h"
 #include "channel.h"
 #include "conf.h"
+#include "cvs-version.h"
 #include "defines.h"
 #include "lists.h"
 #include "log.h"
@@ -57,8 +60,10 @@ LOCAL VOID Show_Help PARAMS(( VOID ));
 GLOBAL int
 main( int argc, const char *argv[] )
 {
+       struct passwd *pwd;
+       struct group *grp;
        BOOLEAN ok, configtest = FALSE;
-       INT32 pid, n;
+       LONG pid, n;
        INT i;
 
        umask( 0077 );
@@ -140,7 +145,7 @@ main( int argc, const char *argv[] )
                {
                        /* Kurze Option */
                        
-                       for( n = 1; n < (INT32)strlen( argv[i] ); n++ )
+                       for( n = 1; n < (LONG)strlen( argv[i] ); n++ )
                        {
                                ok = FALSE;
 #ifdef DEBUG
@@ -159,7 +164,7 @@ main( int argc, const char *argv[] )
                                                NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
 
                                                /* zum uebernaechsten Parameter */
-                                               i++; n = strlen( argv[i] );
+                                               i++; n = (LONG)strlen( argv[i] );
                                                ok = TRUE;
                                        }
                                }
@@ -227,7 +232,7 @@ main( int argc, const char *argv[] )
                if( ! NGIRCd_NoDaemon )
                {
                        /* Daemon im Hintergrund erzeugen */
-                       pid = (INT32)fork( );
+                       pid = (LONG)fork( );
                        if( pid > 0 )
                        {
                                /* "alter" Prozess */
@@ -275,15 +280,27 @@ main( int argc, const char *argv[] )
                                if( setuid( Conf_UID ) != 0 ) Log( LOG_ERR, "Can't change User-ID to %u: %s", Conf_UID, strerror( errno ));
                        }
                }
-               Log( LOG_INFO, "Running as user %ld, group %ld, with PID %ld.", (INT32)getuid( ), (INT32)getgid( ), (INT32)getpid( ));
+               
+               /* User, Gruppe und Prozess-ID des Daemon ausgeben */
+               pwd = getpwuid( getuid( )); grp = getgrgid( getgid( ));
+               Log( LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", pwd ? pwd->pw_name : "unknown", (LONG)getuid( ), grp ? grp->gr_name : "unknown", (LONG)getgid( ), (LONG)getpid( ));
 
+               /* stderr in "Error-File" umlenken */
                Log_InitErrorfile( );
 
                /* Signal-Handler initialisieren */
                Initialize_Signal_Handler( );
 
-               /* Protokoll- und Server-Identifikation erzeugen */
-               sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s P", PROTOVER, PROTOSUFFIX, PACKAGE, VERSION, "" );
+               /* Protokoll- und Server-Identifikation erzeugen. Die vom ngIRCd
+                * beim PASS-Befehl verwendete Syntax sowie die erweiterten Flags
+                * sind in doc/Protocol.txt beschrieben. */
+#ifdef IRCPLUS
+               sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE, VERSION, IRCPLUSFLAGS );
+               if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" );
+#else
+               sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE, VERSION );
+#endif
+               strcat( NGIRCd_ProtoID, " P" );
                Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID );
 
                /* Vordefinierte Channels anlegen */
@@ -311,8 +328,12 @@ GLOBAL CHAR *
 NGIRCd_Version( VOID )
 {
        STATIC CHAR version[126];
-
-       sprintf( version, "%s version %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( ));
+       
+#ifdef CVSDATE
+       sprintf( version, "%s %s(%s)-%s", PACKAGE, VERSION, CVSDATE, NGIRCd_VersionAddition( ));
+#else
+       sprintf( version, "%s %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( ));
+#endif
        return version;
 } /* NGIRCd_Version */
 
@@ -328,14 +349,6 @@ NGIRCd_VersionAddition( VOID )
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "SYSLOG" );
 #endif
-#ifdef REGEX
-       if( txt[0] ) strcat( txt, "+" );
-       strcat( txt, "REGEX" );
-#endif
-#ifdef STRICT_RFC
-       if( txt[0] ) strcat( txt, "+" );
-       strcat( txt, "RFC" );
-#endif
 #ifdef DEBUG
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "DEBUG" );
@@ -344,17 +357,21 @@ NGIRCd_VersionAddition( VOID )
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "SNIFFER" );
 #endif
-
+#ifdef STRICT_RFC
+       if( txt[0] ) strcat( txt, "+" );
+       strcat( txt, "RFC" );
+#endif
+#ifdef IRCPLUS
+       if( txt[0] ) strcat( txt, "+" );
+       strcat( txt, "IRCPLUS" );
+#endif
+       
        if( txt[0] ) strcat( txt, "-" );
-#ifdef PROTOTYPES
-       strcat( txt, TARGET_CPU"/"TARGET_VENDOR"/"TARGET_OS );
-#else
        strcat( txt, TARGET_CPU );
        strcat( txt, "/" );
        strcat( txt, TARGET_VENDOR );
        strcat( txt, "/" );
        strcat( txt, TARGET_OS );
-#endif 
 
        return txt;
 } /* NGIRCd_VersionAddition */
@@ -447,7 +464,7 @@ Initialize_Listen_Ports( VOID )
        /* Ports, auf denen der Server Verbindungen entgegennehmen
         * soll, initialisieren */
        
-       UINT created, i;
+       INT created, i;
 
        created = 0;
        for( i = 0; i < Conf_ListenPorts_Count; i++ )
@@ -483,7 +500,7 @@ Show_Help( VOID )
        puts( "  -d, --debug        log extra debug messages" );
 #endif
        puts( "  -f, --config <f>   use file <f> as configuration file" );
-        puts( "  -n, --nodaemon     don't fork and don't detatch from controlling terminal" );
+        puts( "  -n, --nodaemon     don't fork and don't detach from controlling terminal" );
         puts( "  -p, --passive      disable automatic connections to other servers" );
 #ifdef SNIFFER
        puts( "  -s, --sniffer      enable network sniffer and display all IRC traffic" );