user_list.c: Fix a memory leak

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index abd47e181273e0bdc539ba1ffe5e0fef3e7e9969..3d57a9454e87e745e29811a99dc19d2dbf534eb5 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -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]);
@@ -70,16 +68,16 @@ static void populate_user_list(char *user_list_file)
                u->perms = 0;
                while (num > 0) {
                        num--;
-                       if (!strcmp(tmp[num], "AFS_READ"))
-                               u->perms |= AFS_READ;
-                       else if (!strcmp(tmp[num], "AFS_WRITE"))
-                               u->perms |= AFS_WRITE;
+                       if (!strcmp(tmp[num], "VSS_READ"))
+                               u->perms |= VSS_READ;
+                       else if (!strcmp(tmp[num], "VSS_WRITE"))
+                               u->perms |= VSS_WRITE;
                        else if (!strcmp(tmp[num], "DB_READ"))
                                u->perms |= DB_READ;
                        else if (!strcmp(tmp[num], "DB_WRITE"))
                                u->perms |= DB_WRITE;
                        else /* unknown permission */
-                               PARA_WARNING_LOG("unknown permission: %s\n",
+                               PARA_WARNING_LOG("ignoring unknown permission: %s\n",
                                        tmp[num]);
                }
                para_list_add(&u->node, &user_list);
@@ -93,6 +91,14 @@ out:
        exit(EXIT_FAILURE);
 }
 
+/**
+ * initialize the list of users allowed to connecto to para_server
+ *
+ * \param user_list_file the file containing access information
+ *
+ * If this function is called a second time, the contents of the
+ * previous call are discarded.
+ */
 void init_user_list(char *user_list_file)
 {
        struct user *u, *tmp;
@@ -114,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;
 }