X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=user_list.c;h=64f211499fcf51416b9b2a080e1d1798e004c0b3;hp=c6d45ca5f4b2846f7f5a6350a8e84b3c551539a7;hb=5b30367a7e47fe5b9014599586e819305d76c9b0;hpb=2cc93ff31f16e65c1c1f94b0044b32f6be67cbd3

diff --git a/user_list.c b/user_list.c
index c6d45ca5..64f21149 100644
--- 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]);
@@ -74,10 +72,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]);
@@ -110,7 +108,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);
-			free(u->rsa);
+			rsa_free(u->rsa);
 			free(u);
 		}
 	} else