]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/ngircd.c
Log an error (not info) when working directory can't be changed
[ngircd-alex.git] / src / ngircd / ngircd.c
index e8370a1cce971f62a2ba8b561d61f26a04713f2e..5637cb2578666c91ef0a9945231fc2b74686d97c 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -255,16 +255,16 @@ main(int argc, const char *argv[])
                NGIRCd_SignalRestart = false;
                NGIRCd_SignalQuit = false;
 
-               Random_Init();
-
                /* Initialize modules, part I */
                Log_Init(!NGIRCd_NoDaemon);
+               Random_Init();
                Conf_Init();
+               Log_ReInit();
 
                /* Initialize the "main program": chroot environment, user and
                 * group ID, ... */
                if (!NGIRCd_Init(NGIRCd_NoDaemon)) {
-                       Log(LOG_ALERT, "Fatal: Initialization failed");
+                       Log(LOG_ALERT, "Fatal: Initialization failed, exiting!");
                        exit(1);
                }
 
@@ -330,6 +330,7 @@ main(int argc, const char *argv[])
                Channel_Exit();
                Class_Exit();
                Log_Exit();
+               Signals_Exit();
        }
        Pidfile_Delete();
 
@@ -346,70 +347,106 @@ main(int argc, const char *argv[])
  * line switch.
  */
 static void
-Fill_Version( void )
+Fill_Version(void)
 {
        NGIRCd_VersionAddition[0] = '\0';
 
-#ifdef SYSLOG
-       strlcpy( NGIRCd_VersionAddition, "SYSLOG", sizeof NGIRCd_VersionAddition );
+#ifdef ICONV
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "CHARCONV",
+               sizeof NGIRCd_VersionAddition);
 #endif
-#ifdef ZLIB
-       if( NGIRCd_VersionAddition[0] )
-               strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-       strlcat( NGIRCd_VersionAddition, "ZLIB", sizeof NGIRCd_VersionAddition );
+#ifdef DEBUG
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "DEBUG",
+               sizeof NGIRCd_VersionAddition);
 #endif
-#ifdef SSL_SUPPORT
-       if ( NGIRCd_VersionAddition[0] ) strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-       strlcat( NGIRCd_VersionAddition, "SSL", sizeof NGIRCd_VersionAddition );
+#ifdef IDENTAUTH
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "IDENT",
+               sizeof NGIRCd_VersionAddition);
 #endif
-#ifdef TCPWRAP
-       if( NGIRCd_VersionAddition[0] )
-                       strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-       strlcat( NGIRCd_VersionAddition, "TCPWRAP", sizeof NGIRCd_VersionAddition );
+#ifdef WANT_IPV6
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof(NGIRCd_VersionAddition));
+       strlcat(NGIRCd_VersionAddition, "IPv6",
+               sizeof(NGIRCd_VersionAddition));
 #endif
-#ifdef IDENTAUTH
-       if( NGIRCd_VersionAddition[0] )
-               strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-       strlcat( NGIRCd_VersionAddition, "IDENT", sizeof NGIRCd_VersionAddition );
+#ifdef IRCPLUS
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "IRCPLUS",
+               sizeof NGIRCd_VersionAddition);
 #endif
 #ifdef PAM
        if (NGIRCd_VersionAddition[0])
-               strlcat(NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition);
-       strlcat(NGIRCd_VersionAddition, "PAM", sizeof NGIRCd_VersionAddition);
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "PAM",
+               sizeof NGIRCd_VersionAddition);
 #endif
-#ifdef DEBUG
-       if( NGIRCd_VersionAddition[0] )
-               strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-       strlcat( NGIRCd_VersionAddition, "DEBUG", sizeof NGIRCd_VersionAddition );
+#ifdef STRICT_RFC
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "RFC",
+               sizeof NGIRCd_VersionAddition);
 #endif
 #ifdef SNIFFER
-       if( NGIRCd_VersionAddition[0] )
-               strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-       strlcat( NGIRCd_VersionAddition, "SNIFFER", sizeof NGIRCd_VersionAddition );
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "SNIFFER",
+               sizeof NGIRCd_VersionAddition);
 #endif
-#ifdef STRICT_RFC
-       if( NGIRCd_VersionAddition[0] )
-               strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-       strlcat( NGIRCd_VersionAddition, "RFC", sizeof NGIRCd_VersionAddition );
+#ifdef SSL_SUPPORT
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "SSL",
+               sizeof NGIRCd_VersionAddition);
 #endif
-#ifdef IRCPLUS
-       if( NGIRCd_VersionAddition[0] )
-               strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-       strlcat( NGIRCd_VersionAddition, "IRCPLUS", sizeof NGIRCd_VersionAddition );
+#ifdef SYSLOG
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "SYSLOG",
+               sizeof NGIRCd_VersionAddition);
 #endif
-#ifdef WANT_IPV6
+#ifdef TCPWRAP
        if (NGIRCd_VersionAddition[0])
-               strlcat(NGIRCd_VersionAddition, "+", sizeof(NGIRCd_VersionAddition));
-       strlcat(NGIRCd_VersionAddition, "IPv6", sizeof(NGIRCd_VersionAddition));
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "TCPWRAP",
+               sizeof NGIRCd_VersionAddition);
 #endif
-       if( NGIRCd_VersionAddition[0] )
-               strlcat( NGIRCd_VersionAddition, "-", sizeof( NGIRCd_VersionAddition ));
-
-       strlcat( NGIRCd_VersionAddition, TARGET_CPU, sizeof( NGIRCd_VersionAddition ));
-       strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition ));
-       strlcat( NGIRCd_VersionAddition, TARGET_VENDOR, sizeof( NGIRCd_VersionAddition ));
-       strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition ));
-       strlcat( NGIRCd_VersionAddition, TARGET_OS, sizeof( NGIRCd_VersionAddition ));
+#ifdef ZLIB
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+",
+                       sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "ZLIB",
+               sizeof NGIRCd_VersionAddition);
+#endif
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "-",
+                       sizeof(NGIRCd_VersionAddition));
+
+       strlcat(NGIRCd_VersionAddition, HOST_CPU,
+               sizeof(NGIRCd_VersionAddition));
+       strlcat(NGIRCd_VersionAddition, "/", sizeof(NGIRCd_VersionAddition));
+       strlcat(NGIRCd_VersionAddition, HOST_VENDOR,
+               sizeof(NGIRCd_VersionAddition));
+       strlcat(NGIRCd_VersionAddition, "/", sizeof(NGIRCd_VersionAddition));
+       strlcat(NGIRCd_VersionAddition, HOST_OS,
+               sizeof(NGIRCd_VersionAddition));
 
        snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s",
                 PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition);
@@ -423,7 +460,7 @@ static void
 Show_Version( void )
 {
        puts( NGIRCd_Version );
-       puts( "Copyright (c)2001-2012 Alexander Barton (<alex@barton.de>) and Contributors." );
+       puts( "Copyright (c)2001-2013 Alexander Barton (<alex@barton.de>) and Contributors." );
        puts( "Homepage: <http://ngircd.barton.de/>\n" );
        puts( "This is free software; see the source for copying conditions. There is NO" );
        puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );
@@ -498,20 +535,23 @@ Pidfile_Create(pid_t pid)
 
        len = snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);
        if (len < 0 || len >= (int)sizeof pidbuf) {
-               Log( LOG_ERR, "Error converting pid");
+               Log(LOG_ERR, "Error converting process ID!");
+               close(pidfd);
                return;
        }
        
        if (write(pidfd, pidbuf, (size_t)len) != (ssize_t)len)
-               Log( LOG_ERR, "Can't write PID file (%s): %s", Conf_PidFile, strerror( errno ));
+               Log(LOG_ERR, "Can't write PID file (%s): %s!", Conf_PidFile,
+                   strerror(errno));
 
-       if( close(pidfd) != 0 )
-               Log( LOG_ERR, "Error closing PID file (%s): %s", Conf_PidFile, strerror( errno ));
+       if (close(pidfd) != 0)
+               Log(LOG_ERR, "Error closing PID file (%s): %s!", Conf_PidFile,
+                   strerror(errno));
 } /* Pidfile_Create */
 
 
 /**
- * Redirect stdin, stdout and stderr to apropriate file handles.
+ * Redirect stdin, stdout and stderr to appropriate file handles.
  *
  * @param fd   The file handle stdin, stdout and stderr should be redirected to.
  */
@@ -529,6 +569,8 @@ Setup_FDStreams(int fd)
 } /* Setup_FDStreams */
 
 
+#if !defined(SINGLE_USER_OS)
+
 /**
  * Get user and group ID of unprivileged "nobody" user.
  *
@@ -555,9 +597,10 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
 #endif
 
        pwd = getpwnam("nobody");
-       if (!pwd) return false;
+       if (!pwd)
+               return false;
 
-       if ( !pwd->pw_uid || !pwd->pw_gid)
+       if (!pwd->pw_uid || !pwd->pw_gid)
                return false;
 
        *uid = pwd->pw_uid;
@@ -567,6 +610,8 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
        return true;
 } /* NGIRCd_getNobodyID */
 
+#endif
+
 
 static bool
 Random_Init_Kern(const char *file)
@@ -602,12 +647,12 @@ Random_Init(void)
 /**
  * Initialize ngIRCd daemon.
  *
- * @param NGIRCd_NoDaemon      Set to true if ngIRCd should run in the
- *                             foreground and not as a daemon.
- * @return                     true on success.
+ * @param NGIRCd_NoDaemon Set to true if ngIRCd should run in the
+ *             foreground (and not as a daemon).
+ * @return true on success.
  */
 static bool
-NGIRCd_Init( bool NGIRCd_NoDaemon ) 
+NGIRCd_Init(bool NGIRCd_NoDaemon)
 {
        static bool initialized;
        bool chrooted = false;
@@ -623,57 +668,82 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
                /* open /dev/null before chroot() */
                fd = open( "/dev/null", O_RDWR);
                if (fd < 0)
-                       Log(LOG_WARNING, "Could not open /dev/null: %s", strerror(errno));
+                       Log(LOG_WARNING, "Could not open /dev/null: %s",
+                           strerror(errno));
        }
 
-       if (!ConnSSL_InitLibrary())
-               Log(LOG_WARNING,
-                   "Warning: Error during SSL initialization, continuing ...");
+       /* SSL initialization */
+       if (!ConnSSL_InitLibrary()) {
+               Log(LOG_ERR, "Error during SSL initialization!");
+               goto out;
+       }
 
-       if( Conf_Chroot[0] ) {
-               if( chdir( Conf_Chroot ) != 0 ) {
-                       Log( LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", Conf_Chroot, strerror( errno ));
+       /* Change root */
+       if (Conf_Chroot[0]) {
+               if (chdir(Conf_Chroot) != 0) {
+                       Log(LOG_ERR, "Can't chdir() in ChrootDir (%s): %s!",
+                           Conf_Chroot, strerror(errno));
                        goto out;
                }
 
-               if( chroot( Conf_Chroot ) != 0 ) {
-                       if (errno != EPERM) {
-                               Log( LOG_ERR, "Can't change root directory to \"%s\": %s",
-                                                               Conf_Chroot, strerror( errno ));
-                               goto out;
-                       }
+               if (chroot(Conf_Chroot) != 0) {
+                       Log(LOG_ERR,
+                           "Can't change root directory to \"%s\": %s!",
+                           Conf_Chroot, strerror(errno));
+                       goto out;
                } else {
                        chrooted = true;
-                       Log( LOG_INFO, "Changed root and working directory to \"%s\".", Conf_Chroot );
+                       Log(LOG_INFO,
+                           "Changed root and working directory to \"%s\".",
+                           Conf_Chroot);
                }
        }
 
+#if !defined(SINGLE_USER_OS)
+       /* Check user ID */
        if (Conf_UID == 0) {
-               Log(LOG_INFO, "ServerUID must not be 0, using \"nobody\" instead.", Conf_UID);
-
-               if (! NGIRCd_getNobodyID(&Conf_UID, &Conf_GID)) {
-                       Log(LOG_WARNING, "Could not get user/group ID of user \"nobody\": %s",
-                                       errno ? strerror(errno) : "not found" );
+               pwd = getpwuid(0);
+               Log(LOG_INFO,
+                   "ServerUID must not be %s(0), using \"nobody\" instead.",
+                   pwd ? pwd->pw_name : "?");
+               if (!NGIRCd_getNobodyID(&Conf_UID, &Conf_GID)) {
+                       Log(LOG_WARNING,
+                           "Could not get user/group ID of user \"nobody\": %s",
+                           errno ? strerror(errno) : "not found" );
                        goto out;
                }
        }
 
+       /* Change group ID */
        if (getgid() != Conf_GID) {
-               /* Change group ID */
                if (setgid(Conf_GID) != 0) {
                        real_errno = errno;
-                       Log( LOG_ERR, "Can't change group ID to %u: %s", Conf_GID, strerror( errno ));
+                       grp = getgrgid(Conf_GID);
+                       Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
+                           grp ? grp->gr_name : "?", Conf_GID,
+                           strerror(real_errno));
                        if (real_errno != EPERM) 
                                goto out;
                }
+               if (setgroups(0, NULL) != 0) {
+                       real_errno = errno;
+                       Log(LOG_ERR, "Can't drop supplementary group IDs: %s!",
+                                       strerror(errno));
+                       if (real_errno != EPERM)
+                               goto out;
+               }
        }
+#endif
 
+       /* Change user ID */
        if (getuid() != Conf_UID) {
-               /* Change user ID */
                if (setuid(Conf_UID) != 0) {
                        real_errno = errno;
-                       Log(LOG_ERR, "Can't change user ID to %u: %s", Conf_UID, strerror(errno));
-                       if (real_errno != EPERM) 
+                       pwd = getpwuid(Conf_UID);
+                       Log(LOG_ERR, "Can't change user ID to %s(%u): %s!",
+                           pwd ? pwd->pw_name : "?", Conf_UID,
+                           strerror(real_errno));
+                       if (real_errno != EPERM)
                                goto out;
                }
        }
@@ -683,27 +753,28 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
        /* Normally a child process is forked which isn't any longer
         * connected to ther controlling terminal. Use "--nodaemon"
         * to disable this "daemon mode" (useful for debugging). */
-       if ( ! NGIRCd_NoDaemon ) {
-               pid = fork( );
-               if( pid > 0 ) {
+       if (!NGIRCd_NoDaemon) {
+               pid = fork();
+               if (pid > 0) {
                        /* "Old" process: exit. */
-                       exit( 0 );
+                       exit(0);
                }
-               if( pid < 0 ) {
+               if (pid < 0) {
                        /* Error!? */
-                       fprintf( stderr, "%s: Can't fork: %s!\nFatal error, exiting now ...\n",
-                                                               PACKAGE_NAME, strerror( errno ));
-                       exit( 1 );
+                       fprintf(stderr,
+                               "%s: Can't fork: %s!\nFatal error, exiting now ...\n",
+                               PACKAGE_NAME, strerror(errno));
+                       exit(1);
                }
 
                /* New child process */
-#ifndef NeXT
-               (void)setsid( );
+#ifdef HAVE_SETSID
+               (void)setsid();
 #else
                setpgrp(0, getpid());
 #endif
-               if (chdir( "/" ) != 0)
-                       Log(LOG_ERR, "Can't change directory to '/': %s",
+               if (chdir("/") != 0)
+                       Log(LOG_ERR, "Can't change directory to '/': %s!",
                                     strerror(errno));
 
                /* Detach stdin, stdout and stderr */
@@ -713,19 +784,19 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
        }
        pid = getpid();
 
-       Pidfile_Create( pid );
+       Pidfile_Create(pid);
 
        /* Check UID/GID we are running as, can be different from values
         * configured (e. g. if we were already started with a UID>0. */
        Conf_UID = getuid();
        Conf_GID = getgid();
 
-       pwd = getpwuid( Conf_UID );
-       grp = getgrgid( Conf_GID );
+       pwd = getpwuid(Conf_UID);
+       grp = getgrgid(Conf_GID);
 
        Log(LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.",
-                               pwd ? pwd->pw_name : "unknown", (long)Conf_UID,
-                               grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)pid);
+           pwd ? pwd->pw_name : "unknown", (long)Conf_UID,
+           grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)pid);
 
        if (chrooted) {
                Log(LOG_INFO, "Running with root directory \"%s\".",
@@ -734,20 +805,23 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
        } else
                Log(LOG_INFO, "Not running with changed root directory.");
 
-       /* Change working directory to home directory of the user
-        * we are running as (only when running in daemon mode and not in chroot) */
+       /* Change working directory to home directory of the user we are
+        * running as (only when running in daemon mode and not in chroot) */
+
+       if (NGIRCd_NoDaemon)
+               return true;
 
        if (pwd) {
-               if (!NGIRCd_NoDaemon ) {
-                       if( chdir( pwd->pw_dir ) == 0 ) 
-                               Log( LOG_DEBUG, "Changed working directory to \"%s\" ...", pwd->pw_dir );
-                       else 
-                               Log( LOG_INFO, "Notice: Can't change working directory to \"%s\": %s",
-                                                               pwd->pw_dir, strerror( errno ));
-               }
-       } else {
-               Log( LOG_ERR, "Can't get user informaton for UID %d!?", Conf_UID );
-       }
+               if (chdir(pwd->pw_dir) == 0)
+                       Log(LOG_DEBUG,
+                           "Changed working directory to \"%s\" ...",
+                           pwd->pw_dir);
+               else
+                       Log(LOG_ERR,
+                           "Can't change working directory to \"%s\": %s!",
+                           pwd->pw_dir, strerror(errno));
+       } else
+               Log(LOG_ERR, "Can't get user informaton for UID %d!?", Conf_UID);
 
        return true;
  out: