From: Volker Lendecke <vl@samba.org>
Date: Fri, 2 Jan 2009 14:01:47 +0000 (+0100)
Subject: Revert "idmap: Remove passd check from idmap_backends_unixid_to_sid()."
X-Git-Tag: samba-3.3.0~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e607d7c9a772096293b16243df1be4501d73d66;p=thirdparty%2Fsamba.git

Revert "idmap: Remove passd check from idmap_backends_unixid_to_sid()."

This reverts commit 3d22b77f1ac5e8f83d1063d87c68e60655a3ed6b.
(cherry picked from commit 860da910633415d1a3c850ed977a6635d28a7bf2)
---

diff --git a/source/winbindd/idmap.c b/source/winbindd/idmap.c
index 6be55ef03c6..38cc0d0c0ab 100644
--- a/source/winbindd/idmap.c
+++ b/source/winbindd/idmap.c
@@ -735,6 +735,15 @@ 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);
+	}
+
 	dom = idmap_find_domain(domname);
 	if (dom == NULL) {
 		return NT_STATUS_NONE_MAPPED;