summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-01-02 14:51:06 +0100
committerVolker Lendecke <vl@samba.org>2009-01-02 15:00:05 +0100
commitc033ea562669a2d28da53b3dbe566cdb7d26d43e (patch)
treed3f86bb5a5580744b4d31e1dcb3accdd31eba473
parent71c74725bce403e36e4dc38287802c95b8d4de66 (diff)
downloadsamba-c033ea562669a2d28da53b3dbe566cdb7d26d43e.tar.gz
samba-c033ea562669a2d28da53b3dbe566cdb7d26d43e.tar.bz2
samba-c033ea562669a2d28da53b3dbe566cdb7d26d43e.zip
Revert "s3:idmap: Remove passd check from idmap_backends_unixid_to_sid()."
This reverts commit 45db33e73262d8e195a46fb96405dfb3dc43d6bc.
-rw-r--r--source3/winbindd/idmap.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
index 6be55ef03c..38cc0d0c0a 100644
--- a/source3/winbindd/idmap.c
+++ b/source3/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;