X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=d9cd1fd4d3cce54657e8e6f24b65362570aa8194;hp=be97516f1e66272cf53abde69122d80906d53159;hb=4c2b2a8a9db9e45f4555a6dc9f57f2fb3a998a6c;hpb=aef566e9c8680629bac1ea84893b8b3ccd13da77

diff --git a/server.c b/server.c
index be97516f..d9cd1fd4 100644
--- a/server.c
+++ b/server.c
@@ -243,6 +243,8 @@ void parse_config_or_die(int override)
 	daemon_set_flag(DF_LOG_PID);
 	daemon_set_flag(DF_LOG_LL);
 	daemon_set_flag(DF_LOG_TIME);
+	if (conf.log_timing_given)
+		daemon_set_flag(DF_LOG_TIMING);
 	ret = 1;
 out:
 	free(cf);
@@ -439,19 +441,21 @@ err:
 static int init_afs(void)
 {
 	int ret, afs_server_socket[2];
+	pid_t afs_pid;
 
 	ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, afs_server_socket);
 	if (ret < 0)
 		exit(EXIT_FAILURE);
 	get_random_bytes_or_die((unsigned char *)&afs_socket_cookie,
 		sizeof(afs_socket_cookie));
-	mmd->afs_pid = fork();
-	if (mmd->afs_pid < 0)
+	afs_pid = fork();
+	if (afs_pid < 0)
 		exit(EXIT_FAILURE);
-	if (!mmd->afs_pid) { /* child (afs) */
+	if (afs_pid == 0) { /* child (afs) */
 		close(afs_server_socket[0]);
 		afs_init(afs_socket_cookie, afs_server_socket[1]);
 	}
+	mmd->afs_pid = afs_pid;
 	close(afs_server_socket[1]);
 	ret = mark_fd_nonblocking(afs_server_socket[0]);
 	if (ret < 0)