diff options
| author | Volker Lendecke <vl@samba.org> | 2009-01-02 14:51:23 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-01-02 15:00:05 +0100 |
| commit | 13248e8917015435c8979535531484344e3f2262 (patch) | |
| tree | ffa383a1e454e3790a5338dfdd93ae024b8f67e9 | |
| parent | c033ea562669a2d28da53b3dbe566cdb7d26d43e (diff) | |
| download | samba-13248e8917015435c8979535531484344e3f2262.tar.gz samba-13248e8917015435c8979535531484344e3f2262.tar.bz2 samba-13248e8917015435c8979535531484344e3f2262.zip | |
Revert "s:Fix uid_to_sid mapping when the idmap cache is empty."
This reverts commit 9a9b64dbdfce4414ada22d4f882c8c757b5813e1.
| -rw-r--r-- | source3/winbindd/idmap.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c index 38cc0d0c0a..aaba7e53ee 100644 --- a/source3/winbindd/idmap.c +++ b/source3/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); |