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

Karolin Seeger kseeger at samba.org
Sun Jan 23 11:56:53 MST 2011


The branch, v3-4-stable has been updated
       via  127a16b WHATSNEW: Add changes since 3.4.10.
       via  d682729 s3: Fix connecting to port-139 only servers
      from  8dde27b WHATSNEW: Start release notes for Samba 3.4.11.

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


- Log -----------------------------------------------------------------
commit 127a16ba26373460033eceb4e012faa9cb1930f0
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sun Jan 23 19:54:47 2011 +0100

    WHATSNEW: Add changes since 3.4.10.
    
    Karolin
    (cherry picked from commit bcdfa183c1de202f64805942041dd182f6c013ea)

commit d682729a6cc1cf852798b7927a9ab436e140c668
Author: Volker Lendecke <vl at 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)
    (cherry picked from commit 569be63e727e69e7e52ec39f40e60903c6826614)

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

Summary of changes:
 WHATSNEW.txt                     |   10 ++++++----
 source3/libsmb/smbsock_connect.c |    8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 49753a5..e531d60 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,18 +1,20 @@
                    ==============================
                    Release Notes for Samba 3.4.11
-			  January , 2011
+			  January 12, 2011
                    ==============================
 
 
-This is the latest stable release of Samba 3.4.
+This is the latest stable release of Samba 3.4. It addresses the following
+issue introduced with Samba 3.4.10:
 
-Major enhancements in Samba 3.4.11 include:
+   o Fix connecting to port-139 only servers (bug 7881).
 
-   o
 
 Changes since 3.4.10
 --------------------
 
+o   Volker Lendecke <vl at samba.org>
+    * BUG 7881: Fix connecting to port-139 only servers.
 
 
 ######################################################################
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


More information about the samba-cvs mailing list