From 3fa16da8c70af9c54e03ea2a497d18009d2126e9 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 3 Sep 2008 14:36:43 -0400
Subject: Revert "Split lookup_name() and create a new functiong called"

This reverts commit 8594edf666c29fd4ddf1780da842683dd81483b6.
(This used to be commit ad462e2e2d025a7fc23e7dea32b2b442b528970b)
---
 source3/auth/auth_util.c  | 17 +++++++++++++----
 source3/auth/token_util.c |  7 ++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'source3/auth')

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 5b2c3045c3..9220df01c0 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -1086,6 +1086,7 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info,
 	NTSTATUS status;
 	struct samu *sampass = NULL;
 	gid_t *gids;
+	char *qualified_name = NULL;
 	TALLOC_CTX *mem_ctx = NULL;
 	DOM_SID u_sid;
 	enum lsa_SidType type;
@@ -1151,10 +1152,18 @@ NTSTATUS make_server_info_pw(auth_serversupplied_info **server_info,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	if (!lookup_domain_name(mem_ctx,
-				unix_users_domain_name(), unix_username,
-				LOOKUP_NAME_ALL,
-				NULL, NULL, &u_sid, &type)) {
+	qualified_name = talloc_asprintf(mem_ctx, "%s\\%s",
+					unix_users_domain_name(),
+					unix_username );
+	if (!qualified_name) {
+		TALLOC_FREE(result);
+		TALLOC_FREE(mem_ctx);
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	if (!lookup_name(mem_ctx, qualified_name, LOOKUP_NAME_ALL,
+						NULL, NULL,
+						&u_sid, &type)) {
 		TALLOC_FREE(result);
 		TALLOC_FREE(mem_ctx);
 		return NT_STATUS_NO_SUCH_USER;
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 2b55af779e..d6cd2ea3a8 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -291,6 +291,7 @@ NTSTATUS create_builtin_administrators(const DOM_SID *dom_sid)
 {
 	NTSTATUS status;
 	DOM_SID dom_admins, root_sid;
+	fstring root_name;
 	enum lsa_SidType type;
 	TALLOC_CTX *ctx;
 	bool ret;
@@ -316,9 +317,9 @@ NTSTATUS create_builtin_administrators(const DOM_SID *dom_sid)
 	if ( (ctx = talloc_init("create_builtin_administrators")) == NULL ) {
 		return NT_STATUS_NO_MEMORY;
 	}
-	ret = lookup_domain_name(ctx, get_global_sam_name(), "root",
-				 LOOKUP_NAME_DOMAIN,
-				 NULL, NULL, &root_sid, &type);
+	fstr_sprintf( root_name, "%s\\root", get_global_sam_name() );
+	ret = lookup_name(ctx, root_name, LOOKUP_NAME_DOMAIN, NULL, NULL,
+			  &root_sid, &type);
 	TALLOC_FREE( ctx );
 
 	if ( ret ) {
-- 
cgit