X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=a9e9495fd3f7238c4b875f7958cc5ebf8ccdd863;hb=027f2c1237051d2d569d6be7f381c886f659bac3;hp=8ad2ccb62d1ccb249fed22d6e22455d16734ef1a;hpb=ccef244fab11ebc96809b9de62e175b4d166b6e2;p=paraslash.git

diff --git a/server.c b/server.c
index 8ad2ccb6..a9e9495f 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,10 +8,7 @@
 
 
 /**
- * \mainpage Paraslash API Reference
- *
- * Starting points for getting an overview:
- *
+ * \mainpage Starting points for getting an overview:
  *
  * 	- The main programs: \ref server.c, \ref audiod.c, \ref client.c,
  *	  \ref audioc.c, \ref afh.c, \ref play.c,
@@ -52,10 +49,11 @@
  *	- Spawning processes: \ref exec.c,
  *	- Inter process communication: \ref ipc.c,
  *	- Blob tables: \ref blob.c,
- *	- The error subsystem: \ref error.h.
- *	- Access control for paraslash senders: \ref acl.c, \ref acl.h.
- *	- Internal crypto API: \ref crypt.h.
- *	- interactive sessions (libreadline): \ref interactive.c.
+ *	- The error subsystem: \ref error.h, \ref error2.c,
+ *	- Access control for paraslash senders: \ref acl.c, \ref acl.h,
+ *	- Internal crypto API: \ref crypt.h,
+ *	- interactive sessions (libreadline): \ref interactive.c,
+ *	- sideband API: \ref sideband.h.
  *
  * Low-level data structures:
  *
@@ -91,6 +89,7 @@
 #include "signal.h"
 #include "user_list.h"
 #include "color.h"
+#include "ggo.h"
 #include "version.h"
 
 __printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
@@ -236,13 +235,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,8 +337,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 = NULL;
+	st->task.post_select = signal_post_select;
 	sprintf(st->task.status, "signal task");
 
 	PARA_NOTICE_LOG("setting up signal handling\n");
@@ -391,6 +389,9 @@ static int command_post_select(struct sched *s, struct task *t)
 		goto out;
 	}
 	if (child_pid) {
+		/* avoid problems with non-fork-safe PRNGs */
+		unsigned char buf[16];
+		get_random_bytes_or_die(buf, sizeof(buf));
 		close(new_fd);
 		/* parent keeps accepting connections */
 		return 0;
@@ -423,8 +424,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 = NULL;
+	sct->task.post_select = command_post_select;
 	sct->argc = argc;
 	sct->argv = argv;
 	ret = para_listen_simple(IPPROTO_TCP, conf.port_arg);
@@ -475,6 +475,15 @@ static int init_afs(int argc, char **argv)
 	return afs_server_socket[0];
 }
 
+__noreturn static void print_help_and_die(void)
+{
+	struct ggo_help h = DEFINE_GGO_HELP(server);
+	bool d = conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	exit(0);
+}
+
 static void server_init(int argc, char **argv)
 {
 	struct server_cmdline_parser_params params = {
@@ -490,7 +499,10 @@ 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);
+	if (conf.help_given || conf.detailed_help_given)
+		print_help_and_die();
 	drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	/* parse config file, open log and set defaults */
 	parse_config_or_die(0);