From: Ralph Boehme <slow@samba.org>
Date: Fri, 9 Feb 2024 14:24:27 +0000 (+0100)
Subject: s3/lib: use lookup_name_smbconf_ex() in token_contains_name()
X-Git-Tag: tdb-1.4.11~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f27c52144937d6f12a169f13cfe7c9cb6af78e4;p=thirdparty%2Fsamba.git

s3/lib: use lookup_name_smbconf_ex() in token_contains_name()

No change in behaviour as we still ignore lookup erros as well as a not-found
result.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/lib/util_namearray.c b/source3/lib/util_namearray.c
index 3d74410bea6..0b191ad9e87 100644
--- a/source3/lib/util_namearray.c
+++ b/source3/lib/util_namearray.c
@@ -77,6 +77,7 @@ bool token_contains_name(TALLOC_CTX *mem_ctx,
 	const char *prefix;
 	struct dom_sid sid;
 	enum lsa_SidType type;
+	NTSTATUS status;
 
 	if (username != NULL) {
 		size_t domain_len = domain != NULL ? strlen(domain) : 0;
@@ -113,8 +114,14 @@ bool token_contains_name(TALLOC_CTX *mem_ctx,
 	}
 
 	if (!do_group_checks(&name, &prefix)) {
-		if (!lookup_name_smbconf(mem_ctx, name, LOOKUP_NAME_ALL,
-				 NULL, NULL, &sid, &type)) {
+		status = lookup_name_smbconf_ex(mem_ctx,
+						name,
+						LOOKUP_NAME_ALL,
+						NULL,
+						NULL,
+						&sid,
+						&type);
+		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(5, ("lookup_name %s failed\n", name));
 			return False;
 		}
@@ -128,9 +135,15 @@ bool token_contains_name(TALLOC_CTX *mem_ctx,
 
 	for (/* initialized above */ ; *prefix != '\0'; prefix++) {
 		if (*prefix == '+') {
-			if (!lookup_name_smbconf(mem_ctx, name,
-					 LOOKUP_NAME_ALL|LOOKUP_NAME_GROUP,
-					 NULL, NULL, &sid, &type)) {
+			status = lookup_name_smbconf_ex(
+					mem_ctx,
+					name,
+					LOOKUP_NAME_ALL|LOOKUP_NAME_GROUP,
+					NULL,
+					NULL,
+					&sid,
+					&type);
+			if (!NT_STATUS_IS_OK(status)) {
 				DEBUG(5, ("lookup_name %s failed\n", name));
 				return False;
 			}