X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=142e2abb4c982457e2b51b250207e4eedeb77605;hp=efff208b1bd704a1e5bf64aee32491b514b5b14e;hb=6866943e9a10ee46d8c826f96f739ced38415e3e;hpb=a365b8263a0d7a1673699bdf454677c95b38eb95

diff --git a/server.c b/server.c
index efff208b..142e2abb 100644
--- a/server.c
+++ b/server.c
@@ -52,20 +52,19 @@
  *	- Blob tables: \ref blob.c,
  *	- The error subssystem: \ref error.h.
  *	- Access control for paraslash senders: \ref acl.c, \ref acl.h.
+ *	- Internal crypto API: \ref crypt.h.
  *
  * Low-level data structures:
  *
  *	- Doubly linked lists: \ref list.h,
  *	- Ring buffer: \ref ringbuffer.c, \ref ringbuffer.h,
- *	- Hashing: \ref hash.h, \ref sha1.h, \ref sha1.c,
- *	- Crypto: \ref crypt.c.
+ *	- openssl: \ref crypt.c
+ *	- libgcrypt: \ref gcrypt.c
  *	- Forward error correction: \ref fec.c.
  */
 
 #include <signal.h>
-#include <dirent.h>
 #include <sys/time.h>
-#include <openssl/rc4.h>
 #include <regex.h>
 #include <osl.h>
 #include <stdbool.h>
@@ -91,6 +90,7 @@
 #include "signal.h"
 #include "user_list.h"
 #include "color.h"
+#include "version.h"
 
 /** Define the array of error lists needed by para_server. */
 INIT_SERVER_ERRLISTS;
@@ -147,17 +147,14 @@ static int want_colors(void)
 
 static void init_colors_or_die(void)
 {
-	int ret, i;
+	int i;
 
 	if (!want_colors())
 		return;
 	daemon_set_flag(DF_COLOR_LOG);
 	daemon_set_default_log_colors();
-	for (i = 0; i < conf.log_color_given; i++) {
-		ret = daemon_set_log_color(conf.log_color_arg[i]);
-		if (ret < 0)
-			exit(EXIT_FAILURE);
-	}
+	for (i = 0; i < conf.log_color_given; i++)
+		daemon_set_log_color_or_die(conf.log_color_arg[i]);
 }
 
 /*
@@ -429,6 +426,7 @@ static void init_server_command_task(int argc, char **argv)
 	if (ret < 0)
 		goto err;
 	add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */
+	sprintf(sct->task.status, "server command task");
 	register_task(&sct->task);
 	return;
 err: