From: Volker Lendecke <vl@samba.org>
Date: Sat, 14 Jun 2008 14:46:25 +0000 (+0200)
Subject: Group the access checks together in check_user_ok()
X-Git-Tag: samba-4.0.0alpha6~801^2~1052
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee6ee96af2cf6a5bf2b825883a9cb5f2ff64de5b;p=thirdparty%2Fsamba.git

Group the access checks together in check_user_ok()
(This used to be commit 45662b5e8b3c7bc39cb33c5d7deb7e9a91f30a8b)
---

diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index af992d7aee2..54caca9405d 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -66,6 +66,7 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum)
 	unsigned int i;
 	struct vuid_cache_entry *ent = NULL;
 	bool readonly_share;
+	bool admin_user;
 
 	for (i=0; i<VUID_CACHE_SIZE; i++) {
 		ent = &conn->vuid_cache.array[i];
@@ -105,6 +106,12 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum)
 		return False;
 	}
 
+	admin_user = token_contains_name_in_list(
+		vuser->server_info->unix_name,
+		pdb_get_domain(vuser->server_info->sam_account),
+		NULL, vuser->server_info->ptok,
+		lp_admin_users(snum));
+
 	ent = &conn->vuid_cache.array[conn->vuid_cache.next_entry];
 
 	conn->vuid_cache.next_entry =
@@ -128,12 +135,7 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum)
 
 	ent->vuid = vuser->vuid;
 	ent->read_only = readonly_share;
-
-	ent->admin_user = token_contains_name_in_list(
-		vuser->server_info->unix_name,
-		pdb_get_domain(vuser->server_info->sam_account),
-		NULL, vuser->server_info->ptok,
-		lp_admin_users(snum));
+	ent->admin_user = admin_user;
 
 	conn->read_only = ent->read_only;
 	conn->admin_user = ent->admin_user;