X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=user.c;h=3f368e2a6ed6bcecdf176b23122fcb9cf49af7c8;hb=d5d8bd8399bd7f3b90a39faa43412db2b54b7616;hp=497af156905862fda844d81d832deb2ac39702d7;hpb=f140630786827b6405f62a4a8871a48a64325cc5;p=adu.git

diff --git a/user.c b/user.c
index 497af15..3f368e2 100644
--- a/user.c
+++ b/user.c
@@ -246,7 +246,7 @@ static int open_user_table(struct user_info *ui, int create)
 	if (pw && pw->pw_name)
 		ui->pw_name = adu_strdup(pw->pw_name);
 
-	DEBUG_LOG("opening table for uid %u\n", (unsigned)ui->uid);
+	INFO_LOG("opening table for uid %u\n", (unsigned)ui->uid);
 	if (create) {
 		ret = osl(osl_create_table(ui->desc));
 		if (ret < 0)
@@ -312,7 +312,7 @@ void close_user_tables(void)
 			continue;
 		if (!ui->table)
 			continue;
-		DEBUG_LOG("closing user table for uid %u\n", (unsigned)ui->uid);
+		INFO_LOG("closing user table for uid %u\n", (unsigned)ui->uid);
 		ret = osl(osl_close_table(ui->table, OSL_MARK_CLEAN));
 		if (ret < 0)
 			ERROR_LOG("failed to close user table %u: %s\n",
@@ -393,7 +393,34 @@ void sort_hash_table(int (*comp)(const void *, const void *))
 		comp);
 }
 
-int read_uid_file(struct uid_range *admissible_uids)
+int open_admissible_user_tables(struct uid_range *admissible_uids)
+{
+	struct user_info *ui;
+
+	assert(uid_hash_table);
+	DEBUG_LOG("size: %d\n", uid_hash_table_size);
+	FOR_EACH_USER(ui) {
+		int ret;
+
+		if (!ui_used(ui)) {
+			continue;
+		}
+		if (!uid_is_admissible(ui->uid, admissible_uids)) {
+			DEBUG_LOG("uid %u is not admissible\n", ui->uid);
+			ui->flags &= ~UI_FL_ADMISSIBLE;
+			continue;
+		}
+		ui->flags |= UI_FL_ADMISSIBLE;
+		if (ui->table)
+			continue;
+		ret = open_user_table(ui, 0);
+		if (ret < 0)
+			return ret;
+	}
+	return 1;
+}
+
+int read_uid_file(void)
 {
 	size_t size;
 	uint32_t n;
@@ -423,17 +450,11 @@ int read_uid_file(struct uid_range *admissible_uids)
 		assert(ui);
 		if (ui_used(ui)) { /* impossible */
 			ERROR_LOG("duplicate user id!?\n");
-			ret =-EFAULT;
+			ret = -EFAULT;
 			goto out;
 		}
 		ui->uid = uid;
 		ui->flags |= UI_FL_SLOT_USED;
-		if (!uid_is_admissible(uid, admissible_uids))
-			continue;
-		ui->flags |= UI_FL_ADMISSIBLE;
-		ret = open_user_table(ui, 0);
-		if (ret < 0)
-			return ret;
 	}
 	ret = 1;
 out: