Make setgroups(3) function optional

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index d76b47d4ba86dbf3969dfbae1544701c0e4d9608..0e8acb54213e3a3c6e54e99affdf0b9bfed22871 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 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
@@ -17,12 +17,10 @@
  * by the loader of the operating system.
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
@@ -36,23 +34,16 @@
 #include <mcheck.h>
 #endif
 
-#include "defines.h"
 #include "conn.h"
 #include "class.h"
-#include "conf-ssl.h"
 #include "channel.h"
 #include "conf.h"
-#include "lists.h"
 #include "log.h"
-#include "parse.h"
 #include "sighandlers.h"
 #include "io.h"
-#include "irc.h"
 
-#include "exp.h"
 #include "ngircd.h"
 
-
 static void Show_Version PARAMS(( void ));
 static void Show_Help PARAMS(( void ));
 
@@ -297,10 +288,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);
@@ -460,7 +451,7 @@ static void
 Show_Version( void )
 {
        puts( NGIRCd_Version );
-       puts( "Copyright (c)2001-2013 Alexander Barton (<alex@barton.de>) and Contributors." );
+       puts( "Copyright (c)2001-2014 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." );
@@ -613,6 +604,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 +640,7 @@ Random_Init(void)
                return;
        srand(rand() ^ (unsigned)getpid() ^ (unsigned)time(NULL));
 }
+#endif
 
 
 /**
@@ -725,6 +724,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
                        if (real_errno != EPERM) 
                                goto out;
                }
+#ifdef HAVE_SETGROUPS
                if (setgroups(0, NULL) != 0) {
                        real_errno = errno;
                        Log(LOG_ERR, "Can't drop supplementary group IDs: %s!",
@@ -732,6 +732,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
                        if (real_errno != EPERM)
                                goto out;
                }
+#else
+               Log(LOG_WARNING,
+                   "Can't drop supplementary group IDs: setgroups(3) missing!");
+#endif
        }
 #endif
 
@@ -817,8 +821,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);