From: Volker Lendecke <vl@samba.org>
Date: Fri, 2 Jan 2009 14:02:03 +0000 (+0100)
Subject: Revert "Fix uid_to_sid mapping when the idmap cache is empty."
X-Git-Tag: samba-3.3.0~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8f755ad99cc6afd93c3aaffef583f736b9cf448;p=thirdparty%2Fsamba.git

Revert "Fix uid_to_sid mapping when the idmap cache is empty."

This reverts commit d4bc1f8d79929dc1a1d06e92eaf85923a1848e6f.
(cherry picked from commit 605f5911febc25f40c697d4fc1097584ba49021e)
---

diff --git a/source/winbindd/idmap.c b/source/winbindd/idmap.c
index 38cc0d0c0ab..aaba7e53eed 100644
--- a/source/winbindd/idmap.c
+++ b/source/winbindd/idmap.c
@@ -735,13 +735,14 @@ NTSTATUS idmap_backends_unixid_to_sid(const char *domname, struct id_map *id)
 	maps[0] = id;
 	maps[1] = NULL;
 
-	if (sid_check_is_in_builtin(id->sid)
-	    || (sid_check_is_in_our_domain(id->sid))) {
-		dom = idmap_init_passdb_domain(NULL);
-		if (dom == NULL) {
-			return NT_STATUS_NONE_MAPPED;
-		}
-		return dom->methods->unixids_to_sids(dom, maps);
+	/*
+	 * Always give passdb a chance first
+	 */
+
+	dom = idmap_init_passdb_domain(NULL);
+	if ((dom != NULL)
+	    && NT_STATUS_IS_OK(dom->methods->unixids_to_sids(dom, maps))) {
+		return NT_STATUS_OK;
 	}
 
 	dom = idmap_find_domain(domname);