diff options
| author | Andreas Schneider <asn@samba.org> | 2011-11-14 10:01:31 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-11-25 20:22:56 +0100 |
| commit | a64f88f4e97f0f9c006fe6f0cefc0a61efc1ca98 (patch) | |
| tree | d9dc7429780e2cb4e23969e7837f85dba64bf657 | |
| parent | 3651471288ebd05108c9cd7f1bdbb844829244fb (diff) | |
| download | samba-a64f88f4e97f0f9c006fe6f0cefc0a61efc1ca98.tar.gz samba-a64f88f4e97f0f9c006fe6f0cefc0a61efc1ca98.tar.xz samba-a64f88f4e97f0f9c006fe6f0cefc0a61efc1ca98.zip | |
s3-winbind: Don't fail on users without a uid.
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>
| -rw-r--r-- | source3/winbindd/wb_next_pwent.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c index da4754cc9fc..d47b2fca912 100644 --- a/source3/winbindd/wb_next_pwent.c +++ b/source3/winbindd/wb_next_pwent.c @@ -148,7 +148,24 @@ static void wb_next_pwent_fill_done(struct tevent_req *subreq) status = wb_fill_pwent_recv(subreq); TALLOC_FREE(subreq); - if (tevent_req_nterror(req, 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 (tevent_req_nterror(req, status)) { return; } state->gstate->next_user += 1; |