Split lyrics and image lines in stat output.

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index abd47e181273e0bdc539ba1ffe5e0fef3e7e9969..8e21b238a26a0e7a4da29e0d210dfd64ecadf74d 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -1,27 +1,19 @@
 /*
 /*

- * 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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.

  */
 
 /** \file user_list.c user handling for para_server */
 
  */
 
 /** \file user_list.c user handling for para_server */
 

+#include <sys/types.h>
+#include <dirent.h>
+

 #include "para.h"
 #include "error.h"
 #include "fd.h"
 #include "string.h"
 #include "para.h"
 #include "error.h"
 #include "fd.h"
 #include "string.h"

+#include "list.h"

 #include "user_list.h"
 
 static struct list_head user_list;
 #include "user_list.h"
 
 static struct list_head user_list;


@@ -58,11 +50,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);
                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;
                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]);
                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 +60,16 @@ static void populate_user_list(char *user_list_file)
                u->perms = 0;
                while (num > 0) {
                        num--;
                u->perms = 0;
                while (num > 0) {
                        num--;

-                       if (!strcmp(tmp[num], "AFS_READ"))
+                       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], "AFS_READ"))

                                u->perms |= AFS_READ;
                        else if (!strcmp(tmp[num], "AFS_WRITE"))
                                u->perms |= AFS_WRITE;
                                u->perms |= AFS_READ;
                        else if (!strcmp(tmp[num], "AFS_WRITE"))
                                u->perms |= AFS_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 */
                        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);
                                        tmp[num]);
                }
                para_list_add(&u->node, &user_list);


@@ -93,6 +83,14 @@ out:
        exit(EXIT_FAILURE);
 }
 
        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;
 void init_user_list(char *user_list_file)
 {
        struct user *u, *tmp;


@@ -102,7 +100,7 @@ void init_user_list(char *user_list_file)
                list_for_each_entry_safe(u, tmp, &user_list, node) {
                        list_del(&u->node);
                        free(u->name);
                list_for_each_entry_safe(u, tmp, &user_list, node) {
                        list_del(&u->node);
                        free(u->name);

-                       free(u->rsa);
+                       rsa_free(u->rsa);

                        free(u);
                }
        } else
                        free(u);
                }
        } else


@@ -114,19 +112,18 @@ void init_user_list(char *user_list_file)
 /**
  * lookup user in user_list.
  *
 /**
  * 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) {
 {
        struct user *u;
        list_for_each_entry(u, &user_list, node) {

-               if (strcmp(u->name, user->name))
+               if (strcmp(u->name, name))

                        continue;
                        continue;

-               *user = *u;
-               return 1;
+               return u;

        }
        }

-       return -E_BAD_USER;
+       return NULL;

 }
 }