server: Initialize user list at compile time.

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index c9d265e55af7cdcddcb03fcb8dbfaeba86a92906..8c54ab7f78cc150a236d7231283d3b5279d9e3fc 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -13,7 +13,7 @@
 #include "list.h"
 #include "user_list.h"
 
-static struct list_head user_list;
+INITIALIZED_LIST_HEAD(user_list);
 
 /*
  * Fill the list of users known to para_server.
@@ -104,18 +104,13 @@ err:
 void user_list_init(char *user_list_file)
 {
        struct user *u, *tmp;
-       static int initialized;
 
-       if (initialized) {
-               list_for_each_entry_safe(u, tmp, &user_list, node) {
-                       list_del(&u->node);
-                       free(u->name);
-                       free_public_key(u->pubkey);
-                       free(u);
-               }
-       } else
-               INIT_LIST_HEAD(&user_list);
-       initialized = 1;
+       list_for_each_entry_safe(u, tmp, &user_list, node) {
+               list_del(&u->node);
+               free(u->name);
+               free_public_key(u->pubkey);
+               free(u);
+       }
        populate(user_list_file);
 }