X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=user_list.c;fp=user_list.c;h=18b489b9e4c615824822feb801e3820df63ef554;hp=a2b494936f3e8f4138b98c26e181d24638a29b04;hb=ac93cb364106bbaa88bf0d0852981a872166e6a9;hpb=0c35f5c1692909134436cedac65b7c872a0b0867

diff --git a/user_list.c b/user_list.c
index a2b49493..18b489b9 100644
--- a/user_list.c
+++ b/user_list.c
@@ -39,6 +39,24 @@ again:
 	goto again;
 }
 
+/**
+ * Remove all entries from the user list.
+ *
+ * This is called on shutdown and when the user list is reloaded because the
+ * server received SIGHUP.
+ */
+void user_list_deplete(void)
+{
+	struct user *u, *tmpu;
+
+	list_for_each_entry_safe(u, tmpu, &user_list, node) {
+		list_del(&u->node);
+		free(u->name);
+		free_public_key(u->pubkey);
+		free(u);
+	}
+}
+
 /**
  * Initialize the list of users allowed to connect to para_server.
  *
@@ -53,17 +71,12 @@ void user_list_init(char *user_list_file)
 {
 	int ret = -E_USERLIST;
 	FILE *file_ptr = fopen(user_list_file, "r");
-	struct user *u, *tmpu;
+	struct user *u;
 
 	if (!file_ptr)
 		goto err;
 
-	list_for_each_entry_safe(u, tmpu, &user_list, node) {
-		list_del(&u->node);
-		free(u->name);
-		free_public_key(u->pubkey);
-		free(u);
-	}
+	user_list_deplete();
 	for (;;) {
 		int num;
 		char line[255];