X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=c5f9ede61a92be19c4a8580b0eaf01ca4bf4e319;hp=4bc85a345b6328041059da62443a0d544371e324;hb=976c4dcf7865a8bb19129ce7349f666720bf9338;hpb=70a630c4c422298d40453c537edf9d326b613abc

diff --git a/server.c b/server.c
index 4bc85a34..c5f9ede6 100644
--- a/server.c
+++ b/server.c
@@ -196,7 +196,6 @@ void parse_config_or_die(bool reload)
 			goto free_cf;
 		if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && OPT_GIVEN(CONFIG_FILE))
 			goto free_cf;
-		ret = 0;
 		server_lpr = cmdline_lpr;
 		goto success;
 	}
@@ -212,7 +211,7 @@ void parse_config_or_die(bool reload)
 	if (reload) /* config file overrides command line */
 		ret = lls(lls_merge(cf_lpr, cmdline_lpr, CMD_PTR, &merged_lpr,
 			&errctx));
-	else /* command line options overrride config file options */
+	else /* command line options override config file options */
 		ret = lls(lls_merge(cmdline_lpr, cf_lpr, CMD_PTR, &merged_lpr,
 			&errctx));
 	lls_free_parse_result(cf_lpr, CMD_PTR);
@@ -357,8 +356,6 @@ static int command_post_select(struct sched *s, void *context)
 	ret = para_accept(sct->listen_fd, &s->rfds, NULL, 0, &new_fd);
 	if (ret <= 0)
 		goto out;
-	peer_name = remote_name(new_fd);
-	PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
 	mmd->num_connects++;
 	mmd->active_connections++;
 	/*
@@ -384,6 +381,8 @@ static int command_post_select(struct sched *s, void *context)
 		/* parent keeps accepting connections */
 		return 0;
 	}
+	peer_name = remote_name(new_fd);
+	PARA_INFO_LOG("accepted connection from %s\n", peer_name);
 	/* mmd might already have changed at this point */
 	free(chunk_table);
 	alarm(ALARM_TIMEOUT);