X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=00143799c1c729cfd6fb744a204b46a76e2fee3e;hb=8f69a1302a52163c61142531c4a6944510c3ec12;hp=ced2e451bafe4534671bbdb492066f4beeb8e1bb;hpb=799df0ceb9d496cb11a60ad130d664836df69823;p=paraslash.git

diff --git a/afs.c b/afs.c
index ced2e451..00143799 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) {
@@ -1007,6 +1009,9 @@ __noreturn void afs_init(int socket_fd)
 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));
@@ -1019,6 +1024,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];