gui.c: make command pipe a nonblocking fd

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index 54e27caa0d93bdea8960566196db649b22f0d815..c3b10b1e1d8ca8a915b92a7b4f3080500233210a 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
@@ -70,16 +70,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);
@@ -119,7 +119,7 @@ void init_user_list(char *user_list_file)
  *
  * \return 1 on success and < 0 on errors.
  */
-int get_user(struct user *user)
+int lookup_user(struct user *user)
 {
        struct user *u;
        list_for_each_entry(u, &user_list, node) {