]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3-winbind: Don't fail on users without a uid.
authorAndreas Schneider <asn@samba.org>
Mon, 14 Nov 2011 09:01:31 +0000 (10:01 +0100)
committerKarolin Seeger <kseeger@samba.org>
Fri, 25 Nov 2011 19:23:50 +0000 (20:23 +0100)
This fixes bug #8608.

If you join samba with idmap_ad backend to an AD. When you try to
enumerate users with 'getent passwd' and the user doesn't have a uid
set, then getent is aborted cause of NT_STATUS_NONE_MAPPED. If we can't
map a user we should not stop but continue enumerating users.

This normally happens with the default user 'krbtgt' with idmap_ad but
could also happen with other backends.

Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Tue Nov 15 16:52:04 CET 2011 on sn-devel-104

(backported from commit 10b285ccc29b106f164a6c18116e237634867717)

Signed-off-by: Andreas Schneider <asn@samba.org>
source3/winbindd/wb_next_pwent.c

index fbaaa48b6b89536f5ab1a3559bb8a7a53a220dcf..e5b5e299bfbab57771c868d4dc940450476ac726 100644 (file)
@@ -147,7 +147,24 @@ static void wb_next_pwent_fill_done(struct tevent_req *subreq)
 
        status = wb_fill_pwent_recv(subreq);
        TALLOC_FREE(subreq);
-       if (!NT_STATUS_IS_OK(status)) {
+       /*
+        * When you try to enumerate users with 'getent passwd' and the user
+        * doesn't have a uid set we should just move on.
+        */
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
+               state->gstate->next_user += 1;
+
+               subreq = wb_fill_pwent_send(state,
+                                           state->ev,
+                                           &state->gstate->users[state->gstate->next_user],
+                                           state->pw);
+               if (tevent_req_nomem(subreq, req)) {
+                       return;
+               }
+               tevent_req_set_callback(subreq, wb_next_pwent_fill_done, req);
+
+               return;
+       } else if (!NT_STATUS_IS_OK(status)) {
                tevent_req_nterror(req, status);
                return;
        }