X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=8b13d35b423cfac49e18e433aa31af09db4b4ad4;hp=690f7163984c2f00cb0de1e4982da4668676e500;hb=089fb2fb2d9e2a3473aa6fac91681ca8ddfffff3;hpb=ced0c17d1a3ee0336dc7b35e69faff131dabecac

diff --git a/server.c b/server.c
index 690f7163..8b13d35b 100644
--- a/server.c
+++ b/server.c
@@ -283,7 +283,7 @@ success:
 		daemon_set_flag(DF_LOG_TIMING);
 	daemon_set_priority(OPT_UINT32_VAL(PRIORITY));
 	if (user_list_file)
-		init_user_list(user_list_file);
+		user_list_init(user_list_file);
 	ret = 1;
 free_cf:
 	free(cf);
@@ -674,6 +674,7 @@ int main(int argc, char *argv[])
 		daemon_set_hooks(NULL, NULL); /* only one process remaining */
 		mutex_destroy(log_mutex);
 		shm_detach(mmd);
+		deplete_close_on_fork_list();
 		if (ret < 0)
 			PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	} else {
@@ -683,6 +684,7 @@ int main(int argc, char *argv[])
 	}
 	vss_shutdown();
 	shm_detach(mmd);
+	user_list_deplete();
 	lls_free_parse_result(server_lpr, CMD_PTR);
 	if (server_lpr != cmdline_lpr)
 		lls_free_parse_result(cmdline_lpr, CMD_PTR);