summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-01-22 16:22:42 +0100
committerVolker Lendecke <vlendec@samba.org>2011-01-22 17:42:41 +0100
commit058de59a8e197f6bd9de95dd5de709f018cce6d1 (patch)
tree8ed0abbc8b302462cd36027d228f033b33074313
parent585e9a0ab0e0673f1222a4e26d94c90fb6e88331 (diff)
downloadsamba-058de59a8e197f6bd9de95dd5de709f018cce6d1.tar.gz
samba-058de59a8e197f6bd9de95dd5de709f018cce6d1.tar.xz
samba-058de59a8e197f6bd9de95dd5de709f018cce6d1.zip
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. Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Sat Jan 22 17:42:41 CET 2011 on sn-devel-104
-rw-r--r--source3/libsmb/smbsock_connect.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c
index 174d2aae57d..352de85fd2c 100644
--- a/source3/libsmb/smbsock_connect.c
+++ b/source3/libsmb/smbsock_connect.c
@@ -253,12 +253,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;
}