diff options
| author | Volker Lendecke <vl@samba.org> | 2011-01-22 16:22:42 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-01-23 19:40:55 +0100 |
| commit | d682729a6cc1cf852798b7927a9ab436e140c668 (patch) | |
| tree | 378ad8f5a84b9cc25ecb0281afc9e853449c13d6 | |
| parent | 8dde27b777293a820b23843b2b363c3585349e98 (diff) | |
| download | samba-d682729a6cc1cf852798b7927a9ab436e140c668.tar.gz | |
s3: Fix connecting to port-139 only servers
When the TCP RST came before the 5 msecs timeout kicked in, we
viewed this as final, as state->req_139 was not set yet.
Fix bug introduced by a fix for bug #7881 (winbind flaky against w2k8).
(cherry picked from commit f2a19b87725f9318e983dff6358a3eee721bff08)
(cherry picked from commit 569be63e727e69e7e52ec39f40e60903c6826614)
| -rw-r--r-- | source3/libsmb/smbsock_connect.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c index 8ab12c5e2a2..b6c1c3c058a 100644 --- a/source3/libsmb/smbsock_connect.c +++ b/source3/libsmb/smbsock_connect.c @@ -221,12 +221,14 @@ struct tevent_req *smbsock_connect_send(TALLOC_CTX *mem_ctx, /* * After 5 msecs, fire the 139 request */ - subreq = tevent_wakeup_send(state, ev, timeval_current_ofs(0, 5000)); - if (tevent_req_nomem(subreq, req)) { + state->req_139 = tevent_wakeup_send( + state, ev, timeval_current_ofs(0, 5000)); + if (tevent_req_nomem(state->req_139, req)) { TALLOC_FREE(state->req_445); return tevent_req_post(req, ev); } - tevent_req_set_callback(subreq, smbsock_connect_do_139, req); + tevent_req_set_callback(state->req_139, smbsock_connect_do_139, + req); return req; } |