X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=user_list.c;h=8c54ab7f78cc150a236d7231283d3b5279d9e3fc;hb=7c305178150d5adb4b566e11f1a4bc2e5fe91c8e;hp=23fe086f189e89b3a729aa5afe145006446371bb;hpb=a826152ba51fd4813f715e5fa30e7d70407dc846;p=paraslash.git

diff --git a/user_list.c b/user_list.c
index 23fe086f..8c54ab7f 100644
--- a/user_list.c
+++ b/user_list.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file user_list.c User handling for para_server. */
 
@@ -17,7 +13,7 @@
 #include "list.h"
 #include "user_list.h"
 
-static struct list_head user_list;
+INITIALIZED_LIST_HEAD(user_list);
 
 /*
  * Fill the list of users known to para_server.
@@ -25,7 +21,7 @@ static struct list_head user_list;
  * 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)
+static void populate(char *user_list_file)
 {
 	int ret = -E_USERLIST;
 	FILE *file_ptr = fopen(user_list_file, "r");
@@ -98,29 +94,24 @@ err:
 }
 
 /**
- * Initialize the list of users allowed to connect to to para_server.
+ * Initialize the list of users allowed to connect to para_server.
  *
  * \param user_list_file The file containing access information.
  *
  * If this function is called for the second time, the contents of the
  * previous call are discarded, i.e. the user list is reloaded.
  */
-void init_user_list(char *user_list_file)
+void user_list_init(char *user_list_file)
 {
 	struct user *u, *tmp;
-	static int initialized;
 
-	if (initialized) {
-		list_for_each_entry_safe(u, tmp, &user_list, node) {
-			list_del(&u->node);
-			free(u->name);
-			free_public_key(u->pubkey);
-			free(u);
-		}
-	} else
-		INIT_LIST_HEAD(&user_list);
-	initialized = 1;
-	populate_user_list(user_list_file);
+	list_for_each_entry_safe(u, tmp, &user_list, node) {
+		list_del(&u->node);
+		free(u->name);
+		free_public_key(u->pubkey);
+		free(u);
+	}
+	populate(user_list_file);
 }
 
 /**
@@ -131,9 +122,9 @@ void init_user_list(char *user_list_file)
  * \return A pointer to the corresponding user struct if the user was found, \p
  * NULL otherwise.
  */
-struct user *lookup_user(const char *name)
+const struct user *user_list_lookup(const char *name)
 {
-	struct user *u;
+	const struct user *u;
 	list_for_each_entry(u, &user_list, node) {
 		if (strcmp(u->name, name))
 			continue;