X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=4fe2140be607effea9d5c0a17c1eec8f41011b59;hp=538606add432aef4710c09d5b2826df3d123c933;hb=85ec8f30f6bef37a9a3bc2b84314654648f2f81c;hpb=76079847f5503f3ac222bd46d97754d4b3004506

diff --git a/afs.c b/afs.c
index 538606ad..4fe2140b 100644
--- a/afs.c
+++ b/afs.c
@@ -638,16 +638,18 @@ static int setup_command_socket_or_die(void)
 	return socket_fd;
 }
 
+static char *database_dir;
+
 static void close_afs_tables(void)
 {
 	int i;
 	PARA_NOTICE_LOG("closing afs_tables\n");
 	for (i = 0; i < NUM_AFS_TABLES; i++)
 		afs_tables[i].close();
+	free(database_dir);
+	database_dir = NULL;
 }
 
-static char *database_dir;
-
 static void get_database_dir(void)
 {
 	if (!database_dir) {
@@ -1002,9 +1004,14 @@ __noreturn void afs_init(int socket_fd)
 	}
 	ret = schedule(&s);
 	sched_shutdown(&s);
+	close_current_mood();
 out_close:
 	close_afs_tables();
 out:
+	signal_shutdown(signal_task);
+	free_status_items();
+	free(current_mop);
+	free_lpr();
 	if (ret < 0)
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	exit(EXIT_FAILURE);
@@ -1016,6 +1023,7 @@ static int com_init_callback(struct afs_callback_arg *aca)
 	int i, ret;
 
 	close_afs_tables();
+	get_database_dir();
 	for (i = 0; i < NUM_AFS_TABLES; i++) {
 		struct afs_table *t = &afs_tables[i];