SECURITY: Fixed a message handling bug which could crash the daemon.

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 5b872fc52a309b498f58935001d1dd040b42e803..952a10a435beb4cd0c581be5a2d6ca1103568347 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -40,7 +40,6 @@
 #include "client.h"
 #include "channel.h"
 #include "conf.h"
-#include "cvs-version.h"
 #include "lists.h"
 #include "log.h"
 #include "parse.h"
@@ -85,6 +84,12 @@ main( int argc, const char *argv[] )
        int i;
        size_t n;
 
+#if defined(DEBUG) && defined(HAVE_MTRACE)
+       /* enable GNU libc memory tracing when running in debug mode
+        * and functionality available */
+       mtrace();
+#endif
+
        umask( 0077 );
 
        NGIRCd_SignalQuit = NGIRCd_SignalRestart = NGIRCd_SignalRehash = false;
@@ -167,14 +172,12 @@ main( int argc, const char *argv[] )
                        {
                                ok = false;
 #ifdef DEBUG
-                               if( argv[i][n] == 'd' )
-                               {
+                               if (argv[i][n] == 'd') {
                                        NGIRCd_Debug = true;
                                        ok = true;
                                }
 #endif
-                               if( argv[i][n] == 'f' )
-                               {
+                               if (argv[i][n] == 'f') {
                                        if(( ! argv[i][n + 1] ) && ( i + 1 < argc ))
                                        {
                                                /* Ok, next character is a blank */
@@ -186,31 +189,38 @@ main( int argc, const char *argv[] )
                                                ok = true;
                                        }
                                }
-                               if( argv[i][n] == 'n' )
-                               {
+
+                               if (argv[i][n] == 'h') {
+                                       Show_Version();
+                                       puts(""); Show_Help(); puts("");
+                                       exit(1);
+                               }
+
+                               if (argv[i][n] == 'n') {
                                        NGIRCd_NoDaemon = true;
                                        ok = true;
                                }
-                               if( argv[i][n] == 'p' )
-                               {
+                               if (argv[i][n] == 'p') {
                                        NGIRCd_Passive = true;
                                        ok = true;
                                }
 #ifdef SNIFFER
-                               if( argv[i][n] == 's' )
-                               {
+                               if (argv[i][n] == 's') {
                                        NGIRCd_Sniffer = true;
                                        ok = true;
                                }
 #endif
-                               if( argv[i][n] == 't' )
-                               {
+                               if (argv[i][n] == 't') {
                                        configtest = true;
                                        ok = true;
                                }
 
-                               if( ! ok )
-                               {
+                               if (argv[i][n] == 'V') {
+                                       Show_Version();
+                                       exit(1);
+                               }
+
+                               if (! ok) {
                                        printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] );
                                        printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME );
                                        exit( 1 );
@@ -410,12 +420,9 @@ Fill_Version( void )
        strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition ));
        strlcat( NGIRCd_VersionAddition, TARGET_OS, sizeof( NGIRCd_VersionAddition ));
 
-#ifdef CVSDATE
-       snprintf( NGIRCd_Version, sizeof NGIRCd_Version,"%s %s(%s)-%s", PACKAGE_NAME, PACKAGE_VERSION, CVSDATE, NGIRCd_VersionAddition);
-#else
-       snprintf( NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s", PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition);
-#endif
-} /* Fill_Version */
+       snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s",
+                PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition);
+       } /* Fill_Version */
 
 
 /**
@@ -581,8 +588,8 @@ Show_Help( void )
        puts( "  -s, --sniffer      enable network sniffer and display all IRC traffic" );
 #endif
        puts( "  -t, --configtest   read, validate and display configuration; then exit" );
-       puts( "      --version      output version information and exit" );
-       puts( "      --help         display this help and exit" );
+       puts( "  -V, --version      output version information and exit" );
+       puts( "  -h, --help         display this help and exit" );
 } /* Show_Help */
 
 
@@ -675,6 +682,19 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
 {
        struct passwd *pwd;
 
+#ifdef __CYGWIN__
+       /* Cygwin kludge.
+        * It can return EINVAL instead of EPERM
+        * so, if we are already unprivileged,
+        * use id of current user.
+        */
+       if (geteuid() && getuid()) {
+               *uid = getuid();
+               *gid = getgid();
+               return true;
+       }
+#endif
+
        pwd = getpwnam("nobody");
        if (!pwd) return false;
 
@@ -770,7 +790,11 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
                }
 
                /* New child process */
+#ifndef NeXT
                (void)setsid( );
+#else
+               setpgrp(0, getpid());
+#endif
                chdir( "/" );
 
                /* Detach stdin, stdout and stderr */