X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=c90045c30d81ece771a679f648b203c3aa000910;hp=71a9ec505f6d096a1dc589a9cdf6c1f484e5090d;hb=032d743d782e23604daa926c8e153ad4a75797be;hpb=642445e95fea1c548c79f80ad3b5d6f30ba572f3

diff --git a/server.c b/server.c
index 71a9ec50..c90045c3 100644
--- a/server.c
+++ b/server.c
@@ -207,8 +207,12 @@ void parse_config_or_die(int override)
 		daemon_open_log_or_die();
 	}
 
-	daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
-		conf.logfile_given, conf.log_color_arg, conf.log_color_given);
+	if (daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
+			conf.logfile_given)) {
+		int i;
+		for (i = 0; i < conf.log_color_given; i++)
+			daemon_set_log_color_or_die(conf.log_color_arg[i]);
+	}
 	daemon_set_flag(DF_LOG_PID);
 	daemon_set_flag(DF_LOG_LL);
 	daemon_set_flag(DF_LOG_TIME);
@@ -522,7 +526,7 @@ out:
 	prev_uptime = uptime;
 	prev_events = mmd->events;
 	mmd->vss_status_flags = mmd->new_vss_status_flags;
-	PARA_DEBUG_LOG("%d events, forcing status update\n", mmd->events);
+	PARA_DEBUG_LOG("%u events, forcing status update\n", mmd->events);
 	killpg(0, SIGUSR1);
 }