X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=088cc8b124448123ed6f4cb73f0226f584dffc25;hp=7cb6e5200fa696471e7baaf5a4ee121cdef47755;hb=698178774b857a8959fe70e360ae6ff755eacf8e;hpb=486314426fcd25e5271fd65a982f8b321585e195

diff --git a/server.c b/server.c
index 7cb6e520..088cc8b1 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);
@@ -463,6 +467,7 @@ static void server_init(int argc, char **argv)
 	version_handle_flag("server", conf.version_given);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
+	daemon_set_priority(conf.priority_arg);
 	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	/* parse config file, open log and set defaults */
 	parse_config_or_die(0);