X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=011ece6d3d7689b34e793fb4b00f813afc324fc2;hp=3bcb6e019a442ddf7a8709759937a7d2bd603bf6;hb=3f9051d22fcf6e968259946eaf521ac3daac470e;hpb=bd55215eb1f1c8d041170743dcee5e069d5706b8

diff --git a/daemon.c b/daemon.c
index 3bcb6e01..011ece6d 100644
--- a/daemon.c
+++ b/daemon.c
@@ -269,7 +269,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());
 }
 
@@ -327,7 +331,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);
@@ -338,11 +342,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)) {