X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=c855daa19e194ee5d6e432f89771b907bd909340;hp=12b19275de9f6c561e021dad1b06ed9fae1ba4b9;hb=df6606e438a34c7bfc325e5f320843d1e97d3f7a;hpb=5446dfe5a4d54aa49dbc961956818d751e817326

diff --git a/daemon.c b/daemon.c
index 12b19275..c855daa1 100644
--- a/daemon.c
+++ b/daemon.c
@@ -5,12 +5,14 @@
  */
 
 /** \file daemon.c Some helpers for programs that detach from the console. */
-#include "para.h"
-#include "daemon.h"
+
+#include <regex.h>
 #include <pwd.h>
 #include <sys/types.h> /* getgrnam() */
 #include <grp.h>
 
+#include "para.h"
+#include "daemon.h"
 #include "string.h"
 #include "color.h"
 
@@ -167,7 +169,6 @@ void daemonize(void)
 		goto err;
 	if (chdir("/") < 0)
 		goto err;
-	umask(0);
 	null = open("/dev/null", O_RDONLY);
 	if (null < 0)
 		goto err;
@@ -270,7 +271,11 @@ void drop_privileges_or_die(const char *username, const char *groupname)
 		exit(EXIT_FAILURE);
 	}
 	PARA_INFO_LOG("dropping root privileges\n");
-	setuid(p->pw_uid);
+	if (setuid(p->pw_uid) < 0) {
+		PARA_EMERG_LOG("failed to set effective user ID (%s)",
+			strerror(errno));
+		exit(EXIT_FAILURE);
+	}
 	PARA_DEBUG_LOG("uid: %d, euid: %d\n", (int)getuid(), (int)geteuid());
 }
 
@@ -328,7 +333,7 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
 	FILE *fp;
 	struct tm *tm;
 	time_t t1;
-	char *color, str[MAXLINE] = "";
+	char *color;
 
 	ll = PARA_MIN(ll, NUM_LOGLEVELS - 1);
 	ll = PARA_MAX(ll, LL_DEBUG);
@@ -339,11 +344,11 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
 	color = daemon_test_flag(DF_COLOR_LOG)? me->log_colors[ll] : NULL;
 	if (color)
 		fprintf(fp, "%s", color);
-	if (daemon_test_flag(DF_LOG_TIME)) {
-		/* date and time */
+	if (daemon_test_flag(DF_LOG_TIME)) { /* print date and time */
+		char str[100];
 		time(&t1);
 		tm = localtime(&t1);
-		strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
+		strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
 		fprintf(fp, "%s ", str);
 	}
 	if (daemon_test_flag(DF_LOG_HOSTNAME)) {