X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=user_list.c;h=8648f10b049679046e5812677e34f5c2b9e06132;hp=1143f2d58aa1605d77324fea14bf682e409d1ab4;hb=eb506f75b6c41a37bb3fe3915700f9eafbea6e05;hpb=89b2ebc40332c729be076f6122d1744b205c64bc

diff --git a/user_list.c b/user_list.c
index 1143f2d5..8648f10b 100644
--- a/user_list.c
+++ b/user_list.c
@@ -1,35 +1,28 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 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 */
 
+#include <sys/types.h>
+#include <dirent.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;
 
 /*
- * lookup user in user list file. Fills in a user struct containing
- * filename of the user's public key as well as the permissions of that user.
- * Returns 1 on success, 0 if user does not exist and < 0 on errors.
+ * Fill the list of users known to para_server.
+ *
+ * Populates a linked list of all users in \a user_list_file.  Returns on
+ * success, calls exit() on errors.
  */
 static void populate_user_list(char *user_list_file)
 {
@@ -48,7 +41,7 @@ static void populate_user_list(char *user_list_file)
 		struct user *u;
 		ret = para_fgets(line, MAXLINE, file_ptr);
 		if (ret < 0)
-			PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		if (ret <= 0)
 			break;
 		if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3)
@@ -72,10 +65,10 @@ static void populate_user_list(char *user_list_file)
 				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 if (!strcmp(tmp[num], "AFS_READ"))
+				u->perms |= AFS_READ;
+			else if (!strcmp(tmp[num], "AFS_WRITE"))
+				u->perms |= AFS_WRITE;
 			else /* unknown permission */
 				PARA_WARNING_LOG("ignoring unknown permission: %s\n",
 					tmp[num]);
@@ -87,7 +80,7 @@ out:
 		fclose(file_ptr);
 	if (ret >= 0)
 		return;
-	PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	exit(EXIT_FAILURE);
 }