user_list.c: Fix a memory leak

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index b7d739c130fc08d5d69c159be3c46d927f894df2..3d57a9454e87e745e29811a99dc19d2dbf534eb5 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -58,11 +58,9 @@ static void populate_user_list(char *user_list_file)
                PARA_DEBUG_LOG("found entry for %s\n", n);
                u = para_malloc(sizeof(struct user));
                u->name = para_strdup(n);
-               u->rsa = para_malloc(sizeof(RSA));
                ret = get_rsa_key(k, &u->rsa, LOAD_PUBLIC_KEY);
                if (ret < 0)
                        break;
-               u->perms = 0;
                char_ptr = p;
                num = sscanf(char_ptr, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
                        tmp[0], tmp[1], tmp[2], tmp[3]);
@@ -122,19 +120,18 @@ void init_user_list(char *user_list_file)
 /**
  * lookup user in user_list.
  *
- * \param user: must initially contain the name of the user and is filled
- * in by this function on success.
+ * \param name of the user
  *
- * \return 1 on success and < 0 on errors.
+ * \return a pointer to the corresponding user struct if the user was found,
+ *  \p NULL otherwise.
  */
-int lookup_user(struct user *user)
+struct user *lookup_user(const char *name)
 {
        struct user *u;
        list_for_each_entry(u, &user_list, node) {
-               if (strcmp(u->name, user->name))
+               if (strcmp(u->name, name))
                        continue;
-               *user = *u;
-               return 1;
+               return u;
        }
-       return -E_BAD_USER;
+       return NULL;
 }