From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 21 Mar 2019 15:54:31 +0000 (+0100)
Subject: idmap_hash: only return ID_REQUIRE_TYPE if we don't know about the domain yet
X-Git-Tag: talloc-2.4.1~1414
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ede88d9f83fb77fa8eff226fb6a85ac71e415098;p=thirdparty%2Fsamba.git

idmap_hash: only return ID_REQUIRE_TYPE if we don't know about the domain yet

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15319

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c
index ed20a5e8bed..fb900617ec3 100644
--- a/source3/winbindd/idmap_hash/idmap_hash.c
+++ b/source3/winbindd/idmap_hash/idmap_hash.c
@@ -279,6 +279,14 @@ static NTSTATUS idmap_hash_sid_to_id(struct sid_hash_table *hashed_domains,
 		return NT_STATUS_OK;
 	}
 
+	/*
+	 * If the domain hash already exists find a SID in the table,
+	 * just return the mapping.
+	 */
+	if (hashed_domains[h_domain].sid != NULL) {
+		goto return_mapping;
+	}
+
 	if (id->xid.type == ID_TYPE_NOT_SPECIFIED) {
 		/*
 		 * idmap_hash used to bounce back the requested type,
@@ -313,6 +321,7 @@ static NTSTATUS idmap_hash_sid_to_id(struct sid_hash_table *hashed_domains,
 	 * random mix of ID_TYPE_UID, ID_TYPE_GID or
 	 * ID_TYPE_BOTH.
 	 */
+return_mapping:
 	id->xid.type = ID_TYPE_BOTH;
 	id->xid.id = combine_hashes(h_domain, h_rid);
 	id->status = ID_MAPPED;