[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  569be63 s3: Fix connecting to port-139 only servers
      from  716426b WHATSNEW: Start release notes for Samba 3.4.11.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 569be63e727e69e7e52ec39f40e60903c6826614
Author: Volker Lendecke <v...@samba.org>
Date:   Sat Jan 22 16:22:42 2011 +0100

    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)

-----------------------------------------------------------------------

Summary of changes:
 source3/libsmb/smbsock_connect.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c
index 8ab12c5..b6c1c3c 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;
 }
 


-- 
Samba Shared Repository