server: Deplete user list on exit.

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index a2b494936f3e8f4138b98c26e181d24638a29b04..18b489b9e4c615824822feb801e3820df63ef554 100644 (file)
--- 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];