From c8f755ad99cc6afd93c3aaffef583f736b9cf448 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 2 Jan 2009 15:02:03 +0100 Subject: [PATCH] Revert "Fix uid_to_sid mapping when the idmap cache is empty." This reverts commit d4bc1f8d79929dc1a1d06e92eaf85923a1848e6f. (cherry picked from commit 605f5911febc25f40c697d4fc1097584ba49021e) --- source/winbindd/idmap.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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); -- 2.47.2