Merge branch 'refs/heads/t/clean_server_exit'

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index a2b494936f3e8f4138b98c26e181d24638a29b04..32a4309d4360fa73a8e7d0bbef622a7928001bb0 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -13,7 +13,7 @@
 #include "list.h"
 #include "user_list.h"
 
-INITIALIZED_LIST_HEAD(user_list);
+static INITIALIZED_LIST_HEAD(user_list);
 
 /*
  * Wrapper for fgets(3).
@@ -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);
+               apc_free_pubkey(u->pubkey);
+               free(u);
+       }
+}
+
 /**
  * Initialize the list of users allowed to connect to para_server.
  *
@@ -49,21 +67,16 @@ again:
  *
  * This function either succeeds or calls exit(3).
  */
-void user_list_init(char *user_list_file)
+void user_list_init(const 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];
@@ -79,22 +92,22 @@ void user_list_init(char *user_list_file)
                if (strcmp(w, "user"))
                        continue;
                PARA_DEBUG_LOG("found entry for user %s\n", n);
-               ret = get_public_key(k, &pubkey);
+               ret = apc_get_pubkey(k, &pubkey);
                if (ret < 0) {
                        PARA_NOTICE_LOG("skipping entry for user %s: %s\n", n,
                                para_strerror(-ret));
                        continue;
                }
                /*
-                * In order to encrypt len := CHALLENGE_SIZE + 2 * SESSION_KEY_LEN
+                * In order to encrypt len := APC_CHALLENGE_SIZE + 2 * SESSION_KEY_LEN
                 * bytes using RSA_public_encrypt() with EME-OAEP padding mode,
                 * RSA_size(rsa) must be greater than len + 41. So ignore keys
                 * which are too short. For details see RSA_public_encrypt(3).
                 */
-               if (ret <= CHALLENGE_SIZE + 2 * SESSION_KEY_LEN + 41) {
+               if (ret <= APC_CHALLENGE_SIZE + 2 * SESSION_KEY_LEN + 41) {
                        PARA_WARNING_LOG("public key %s too short (%d)\n",
                                k, ret);
-                       free_public_key(pubkey);
+                       apc_free_pubkey(pubkey);
                        continue;
                }
                u = para_malloc(sizeof(*u));