X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=38beb78f3835b590ae8d61f6fd61200f11b11466;hb=f060db5ec59bcbb736dab70ddd61db6230c10e92;hp=b54d3177f4699864d762ba8eeeeefc14d650b55d;hpb=ba258e65a0fafa444b66f589bc2e3bdc0b42b54c;p=ngircd-alex.git

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index b54d3177..38beb78f 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.46 2002/05/27 13:00:50 alex Exp $
+ * $Id: ngircd.c,v 1.56 2002/10/07 21:16:13 alex Exp $
  *
  * ngircd.c: Hier beginnt alles ;-)
  */
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <time.h>
 
@@ -34,6 +35,7 @@
 #include "client.h"
 #include "channel.h"
 #include "conf.h"
+#include "cvs-version.h"
 #include "defines.h"
 #include "lists.h"
 #include "log.h"
@@ -60,6 +62,8 @@ main( int argc, const char *argv[] )
 	INT32 pid, n;
 	INT i;
 
+	umask( 0077 );
+
 	NGIRCd_Restart = FALSE;
 	NGIRCd_Quit = FALSE;
 	NGIRCd_NoDaemon = FALSE;
@@ -156,7 +160,7 @@ main( int argc, const char *argv[] )
 						NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
 
 						/* zum uebernaechsten Parameter */
-						i++; n = strlen( argv[i] );
+						i++; n = (INT32)strlen( argv[i] );
 						ok = TRUE;
 					}
 				}
@@ -272,22 +276,33 @@ 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.", (INT32)getuid( ), (INT32)getgid( ));
+		Log( LOG_INFO, "Running as user %ld, group %ld, with PID %ld.", (INT32)getuid( ), (INT32)getgid( ), (INT32)getpid( ));
 
 		Log_InitErrorfile( );
 
 		/* Signal-Handler initialisieren */
 		Initialize_Signal_Handler( );
 
+		/* 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 */
+		Channel_InitPredefined( );
+
 		/* Listen-Ports initialisieren */
 		Initialize_Listen_Ports( );
 
 		/* Hauptschleife */
-		while( TRUE )
-		{
-			if( NGIRCd_Quit || NGIRCd_Restart ) break;
-			Conn_Handler( 5 );
-		}
+		Conn_Handler( );
 
 		/* Alles abmelden */
 		Conn_Exit( );
@@ -305,8 +320,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 */
 
@@ -322,14 +341,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" );
@@ -338,9 +349,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, "-" );
-	strcat( txt, TARGET_CPU"/"TARGET_VENDOR"/"TARGET_OS );
+	strcat( txt, TARGET_CPU );
+	strcat( txt, "/" );
+	strcat( txt, TARGET_VENDOR );
+	strcat( txt, "/" );
+	strcat( txt, TARGET_OS );
 
 	return txt;
 } /* NGIRCd_VersionAddition */
@@ -433,7 +456,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++ )