Add support for arc4random

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 4099719b8ebe703e66960c97ae999df1f3274043..da537055ffdd742960a425a067ddfd3a62540f98 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);
                }
 
@@ -297,10 +297,10 @@ main(int argc, const char *argv[])
                         PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION,
                         IRCPLUSFLAGS);
 #ifdef ZLIB
-               strcat(NGIRCd_ProtoID, "Z");
+               strlcat(NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID);
 #endif
                if (Conf_OperCanMode)
-                       strcat(NGIRCd_ProtoID, "o");
+                       strlcat(NGIRCd_ProtoID, "o", sizeof NGIRCd_ProtoID);
 #else /* IRCPLUS */
                snprintf(NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s",
                         PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION);
@@ -613,6 +613,13 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
 #endif
 
 
+#ifdef HAVE_ARC4RANDOM
+static void
+Random_Init(void)
+{
+
+}
+#else
 static bool
 Random_Init_Kern(const char *file)
 {
@@ -642,6 +649,7 @@ Random_Init(void)
                return;
        srand(rand() ^ (unsigned)getpid() ^ (unsigned)time(NULL));
 }
+#endif
 
 
 /**
@@ -673,9 +681,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,14 +729,16 @@ 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) {
-                       Log(LOG_ERR, "Can't drop supplementary group ids: %s!",
+                       real_errno = errno;
+                       Log(LOG_ERR, "Can't drop supplementary group IDs: %s!",
                                        strerror(errno));
-                       goto out;
+                       if (real_errno != EPERM)
+                               goto out;
                }
        }
 #endif
@@ -739,7 +750,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;
                }
@@ -814,8 +825,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);