Merge branch 'master' of /srv/git/ngircd

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 170a3cd7eef1b55f136ebda3ce79f1c231e146d9..f28ff05bcfb778065dc99a50e7459472eee8a68f 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -255,11 +255,11 @@ 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, ... */
@@ -555,9 +555,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;
@@ -641,12 +642,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
                }
 
                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;
-                       }
+                       Log(LOG_ERR,
+                           "Can't change root directory to \"%s\": %s",
+                           Conf_Chroot, strerror(errno));
+                       goto out;
                } else {
                        chrooted = true;
                        Log(LOG_INFO,
@@ -657,10 +656,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
 
        /* Check user ID */
        if (Conf_UID == 0) {
+               pwd = getpwuid(0);
                Log(LOG_INFO,
-                   "ServerUID must not be 0, using \"nobody\" instead.",
-                   Conf_UID);
-
+                   "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",
@@ -673,8 +672,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
        if (getgid() != Conf_GID) {
                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(errno));
                        if (real_errno != EPERM) 
                                goto out;
                }
@@ -684,8 +685,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
        if (getuid() != Conf_UID) {
                if (setuid(Conf_UID) != 0) {
                        real_errno = errno;
-                       Log(LOG_ERR, "Can't change user ID to %u: %s",
-                           Conf_UID, strerror(errno));
+                       pwd = getpwuid(Conf_UID);
+                       Log(LOG_ERR, "Can't change user ID to %s(%u): %s",
+                           pwd ? pwd->pw_name : "?", Conf_UID,
+                           strerror(errno));
                        if (real_errno != EPERM)
                                goto out;
                }