Log an error (not info) when working directory can't be changed

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index e28c370b47af675ab000cf28bf9add9e0afc529d..5637cb2578666c91ef0a9945231fc2b74686d97c 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -264,7 +264,7 @@ main(int argc, const char *argv[])
                /* 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);
                }
 
@@ -551,7 +551,7 @@ Pidfile_Create(pid_t pid)
 
 
 /**
- * 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.
  */
@@ -673,9 +673,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
        }
 
        /* SSL initialization */
-       if (!ConnSSL_InitLibrary())
-               Log(LOG_WARNING,
-                   "Error during SSL initialization, continuing without SSL ...");
+       if (!ConnSSL_InitLibrary()) {
+               Log(LOG_ERR, "Error during SSL initialization!");
+               goto out;
+       }
 
        /* Change root */
        if (Conf_Chroot[0]) {
@@ -720,10 +721,17 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
                        grp = getgrgid(Conf_GID);
                        Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
                            grp ? grp->gr_name : "?", Conf_GID,
-                           strerror(errno));
+                           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
 
@@ -734,7 +742,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
                        pwd = getpwuid(Conf_UID);
                        Log(LOG_ERR, "Can't change user ID to %s(%u): %s!",
                            pwd ? pwd->pw_name : "?", Conf_UID,
-                           strerror(errno));
+                           strerror(real_errno));
                        if (real_errno != EPERM)
                                goto out;
                }
@@ -809,8 +817,8 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
                            "Changed working directory to \"%s\" ...",
                            pwd->pw_dir);
                else
-                       Log(LOG_INFO,
-                           "Notice: Can't change working directory to \"%s\": %s!",
+                       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);