summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-05-29 15:25:39 -0700
committerJeremy Allison <jra@samba.org>2012-05-30 11:59:37 -0700
commitd7e52cc5273c3ec1a0570f06610e30b48c03bf6b (patch)
tree45916bfb4e51ca6cf12b3ba160a8831744c5f98f
parente697253263f9c5138f71574c8f35d1e5e7d957a5 (diff)
downloadsamba-d7e52cc5273c3ec1a0570f06610e30b48c03bf6b.tar.gz
samba-d7e52cc5273c3ec1a0570f06610e30b48c03bf6b.tar.bz2
samba-d7e52cc5273c3ec1a0570f06610e30b48c03bf6b.zip
Fix metze's complaint about the bugfix for bug #8953 - winbind can hang as nbt_getdc() has no timeout.
This code explicitly isn't needed as the tevent code will take care of this.
-rw-r--r--source3/libsmb/clidgram.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index cfed06794d..377219448b 100644
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -450,8 +450,6 @@ NTSTATUS nbt_getdc(struct messaging_context *msg_ctx,
TALLOC_CTX *frame = talloc_stackframe();
struct tevent_context *ev;
struct tevent_req *req;
- enum tevent_req_state err_state;
- uint64_t error;
NTSTATUS status = NT_STATUS_NO_MEMORY;
ev = tevent_context_init(frame);
@@ -473,11 +471,6 @@ NTSTATUS nbt_getdc(struct messaging_context *msg_ctx,
status = nbt_getdc_recv(req, mem_ctx, pnt_version, dc_name,
samlogon_response);
fail:
- if (ev && req &&
- tevent_req_is_error(req, &err_state, &error) &&
- err_state == TEVENT_REQ_TIMED_OUT) {
- status = NT_STATUS_IO_TIMEOUT;
- }
TALLOC_FREE(frame);
return status;
}