X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=cd985c6d7f554d8ef9b2d980a5fe35d0c0690c14;hb=aa74a903545250506fd4c29791e6f4aef3a01c41;hp=e963da7760465af02bcceec58730be2be4be84fd;hpb=74c88020bd325865fe26ed25ea8ad0ace0924136;p=paraslash.git

diff --git a/server.c b/server.c
index e963da77..cd985c6d 100644
--- a/server.c
+++ b/server.c
@@ -236,13 +236,13 @@ void parse_config_or_die(int override)
 			.print_errors = !conf.daemon_given
 		};
 		server_cmdline_parser_config_file(cf, &conf, &params);
+		daemon_set_loglevel(conf.loglevel_arg);
 		conf.daemon_given = tmp;
 	}
 	if (conf.logfile_given) {
 		daemon_set_logfile(conf.logfile_arg);
 		daemon_open_log_or_die();
 	}
-	daemon_set_loglevel(conf.loglevel_arg);
 	init_colors_or_die();
 	daemon_set_flag(DF_LOG_PID);
 	daemon_set_flag(DF_LOG_LL);
@@ -338,7 +338,7 @@ static void init_signal_task(void)
 		*st = &signal_task_struct;
 
 	st->task.pre_select = signal_pre_select;
-	st->task.new_post_select = signal_post_select;
+	st->task.post_select = signal_post_select;
 	sprintf(st->task.status, "signal task");
 
 	PARA_NOTICE_LOG("setting up signal handling\n");
@@ -422,7 +422,7 @@ static void init_server_command_task(int argc, char **argv)
 
 	PARA_NOTICE_LOG("initializing tcp command socket\n");
 	sct->task.pre_select = command_pre_select;
-	sct->task.new_post_select = command_post_select;
+	sct->task.post_select = command_post_select;
 	sct->argc = argc;
 	sct->argv = argv;
 	ret = para_listen_simple(IPPROTO_TCP, conf.port_arg);
@@ -488,7 +488,8 @@ static void server_init(int argc, char **argv)
 	init_random_seed_or_die();
 	/* parse command line options */
 	server_cmdline_parser_ext(argc, argv, &conf, &params);
-	HANDLE_VERSION_FLAG("server", conf);
+	daemon_set_loglevel(conf.loglevel_arg);
+	version_handle_flag("server", conf.version_given);
 	drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	/* parse config file, open log and set defaults */
 	parse_config_or_die(0);