]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
idmap: Remove passd check from idmap_backends_unixid_to_sid().
authorMichael Adam <obnox@samba.org>
Wed, 1 Oct 2008 06:53:15 +0000 (08:53 +0200)
committerKarolin Seeger <kseeger@samba.org>
Fri, 2 Jan 2009 11:44:24 +0000 (12:44 +0100)
As noted by Metzy, it makes no sense here to check id->sid.
What is worse, this might even be passed in uninitialized.

This still fixes the bug for me (of course), but we might need
to check, if another special handling of passdb is needed
(possibly changing from constant return code NT_STATUS_OK...)

Michael
(cherry picked from commit 651b5d6deaab4fb3cb726fafd98171c79777631c)

Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 3d22b77f1ac5e8f83d1063d87c68e60655a3ed6b)

source/winbindd/idmap.c

index 38cc0d0c0abdeb36df77c2249ffe5c9bd85ea824..6be55ef03c63235296a2c6abbb9addf722c6781c 100644 (file)
@@ -735,15 +735,6 @@ 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;