summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-07-21 15:00:18 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-07-21 15:00:18 +1000
commitecc13c3b1f203e5f6b3d7d5bfc50ba2ec2a4b9c8 (patch)
tree896d02f47ac66184a89cf7938d6506c27f12fe8f
parentd626a26374744849f1bc431e02dd5329594589a1 (diff)
downloadsamba-ecc13c3b1f203e5f6b3d7d5bfc50ba2ec2a4b9c8.tar.gz
samba-ecc13c3b1f203e5f6b3d7d5bfc50ba2ec2a4b9c8.tar.bz2
samba-ecc13c3b1f203e5f6b3d7d5bfc50ba2ec2a4b9c8.zip
Fix winbindd not to sit in a busy loop...
Clearly winbindd in Samba4 has not ever been run against windows, as when we fixed the Samba4 server not to cause XP to loop like this, Samba4's own client starts looping... Andrew Bartlett (This used to be commit 9741772190a85c7c42c17ff24a4aa3f53fbc9f3a)
-rw-r--r--source4/winbind/wb_cmd_list_trustdom.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/winbind/wb_cmd_list_trustdom.c b/source4/winbind/wb_cmd_list_trustdom.c
index 8d0c1bd947..fe98ce2f6a 100644
--- a/source4/winbind/wb_cmd_list_trustdom.c
+++ b/source4/winbind/wb_cmd_list_trustdom.c
@@ -159,7 +159,8 @@ static void cmd_list_trustdoms_recv_doms(struct rpc_request *req)
state->r.out.domains->domains[i].sid);
}
- if (NT_STATUS_IS_OK(state->ctx->status)) {
+ if (NT_STATUS_IS_OK(state->ctx->status) || NT_STATUS_EQUAL(state->ctx->status, NT_STATUS_NO_MORE_ENTRIES)) {
+ state->ctx->status = NT_STATUS_OK;
composite_done(state->ctx);
return;
}