X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=5637cb2578666c91ef0a9945231fc2b74686d97c;hp=50d91ce8e2dbff20c87e9dc54505e0bac3406019;hb=13a5358a3d9a439e2f6d70f7770d4b7673bfbbc1;hpb=46b0eef721b9b3eec37d29aff65b6a7fc488a887

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 50d91ce8..5637cb25 100644
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -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
@@ -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);
 		}
 
@@ -460,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." );
@@ -535,21 +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.
  */
@@ -567,6 +569,8 @@ Setup_FDStreams(int fd)
 } /* Setup_FDStreams */
 
 
+#if !defined(SINGLE_USER_OS)
+
 /**
  * Get user and group ID of unprivileged "nobody" user.
  *
@@ -606,6 +610,8 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
 	return true;
 } /* NGIRCd_getNobodyID */
 
+#endif
+
 
 static bool
 Random_Init_Kern(const char *file)
@@ -667,21 +673,22 @@ 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]) {
 		if (chdir(Conf_Chroot) != 0) {
-			Log(LOG_ERR, "Can't chdir() in ChrootDir (%s): %s",
+			Log(LOG_ERR, "Can't chdir() in ChrootDir (%s): %s!",
 			    Conf_Chroot, strerror(errno));
 			goto out;
 		}
 
 		if (chroot(Conf_Chroot) != 0) {
 			Log(LOG_ERR,
-			    "Can't change root directory to \"%s\": %s",
+			    "Can't change root directory to \"%s\": %s!",
 			    Conf_Chroot, strerror(errno));
 			goto out;
 		} else {
@@ -692,6 +699,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
 		}
 	}
 
+#if !defined(SINGLE_USER_OS)
 	/* Check user ID */
 	if (Conf_UID == 0) {
 		pwd = getpwuid(0);
@@ -711,22 +719,30 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
 		if (setgid(Conf_GID) != 0) {
 			real_errno = errno;
 			grp = getgrgid(Conf_GID);
-			Log(LOG_ERR, "Can't change group ID to %s(%u): %s",
+			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
 
 	/* Change user ID */
 	if (getuid() != Conf_UID) {
 		if (setuid(Conf_UID) != 0) {
 			real_errno = errno;
 			pwd = getpwuid(Conf_UID);
-			Log(LOG_ERR, "Can't change user ID to %s(%u): %s",
+			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;
 		}
@@ -758,7 +774,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
 		setpgrp(0, getpid());
 #endif
 		if (chdir("/") != 0)
-			Log(LOG_ERR, "Can't change directory to '/': %s",
+			Log(LOG_ERR, "Can't change directory to '/': %s!",
 				     strerror(errno));
 
 		/* Detach stdin, stdout and stderr */
@@ -801,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);