X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=c5f9ede61a92be19c4a8580b0eaf01ca4bf4e319;hp=2bfc1d8fc3f92ff003266de0c77e5ecf3f578a95;hb=976c4dcf7865a8bb19129ce7349f666720bf9338;hpb=8eb77a20423c3dcc44c4584a082e981391272cb2

diff --git a/server.c b/server.c
index 2bfc1d8f..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);