diff options
| author | Jeremy Allison <jra@samba.org> | 2012-05-22 16:25:14 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-05-22 16:25:14 -0700 |
| commit | d6734029924e849dcd336728dde8d24141e8ccc3 (patch) | |
| tree | 6c9140be039bff749cea88213b0b33a47c51243d /source3/libsmb/clidgram.c | |
| parent | f9e4105f4170181989c44a2326a8a8a89314fc98 (diff) | |
| download | samba-d6734029924e849dcd336728dde8d24141e8ccc3.tar.gz samba-d6734029924e849dcd336728dde8d24141e8ccc3.tar.bz2 samba-d6734029924e849dcd336728dde8d24141e8ccc3.zip | |
Fix bug #8953 - winbind can hang as nbt_getdc() has no timeout.
Add a timeout_in_seconds parameter to nbt_getdc() to make it fail
after that time with NT_STATUS_IO_TIMEOUT.
Diffstat (limited to 'source3/libsmb/clidgram.c')
| -rw-r--r-- | source3/libsmb/clidgram.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c index 04964bd3f0..cfed06794d 100644 --- a/source3/libsmb/clidgram.c +++ b/source3/libsmb/clidgram.c @@ -437,6 +437,7 @@ NTSTATUS nbt_getdc_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, } NTSTATUS nbt_getdc(struct messaging_context *msg_ctx, + uint32_t timeout_in_seconds, const struct sockaddr_storage *dc_addr, const char *domain_name, const struct dom_sid *sid, @@ -449,6 +450,8 @@ 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); @@ -460,12 +463,21 @@ NTSTATUS nbt_getdc(struct messaging_context *msg_ctx, if (req == NULL) { goto fail; } + if (!tevent_req_set_endtime(req, ev, + timeval_current_ofs(timeout_in_seconds, 0))) { + goto fail; + } if (!tevent_req_poll_ntstatus(req, ev, &status)) { goto fail; } 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; } |