[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  e697253 s3:libsmb: use nb_connect_send() directly instead of doing a 0 timer for port 139
      from  633060f selftest: bug #8373 is fixed and we should always test this now.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e697253263f9c5138f71574c8f35d1e5e7d957a5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed May 30 13:20:19 2012 +0200

    s3:libsmb: use nb_connect_send() directly instead of doing a 0 timer for port 139
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed May 30 20:51:51 CEST 2012 on sn-devel-104

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

Summary of changes:
 source3/libsmb/smbsock_connect.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c
index d9d3b92..c5fd2c8 100644
--- a/source3/libsmb/smbsock_connect.c
+++ b/source3/libsmb/smbsock_connect.c
@@ -330,7 +330,7 @@ struct tevent_req *smbsock_connect_send(TALLOC_CTX *mem_ctx,
 					const char *calling_name,
 					int calling_type)
 {
-	struct tevent_req *req, *subreq;
+	struct tevent_req *req;
 	struct smbsock_connect_state *state;
 
 	req = tevent_req_create(mem_ctx, &state, struct smbsock_connect_state);
@@ -352,11 +352,16 @@ struct tevent_req *smbsock_connect_send(TALLOC_CTX *mem_ctx,
 	talloc_set_destructor(state, smbsock_connect_state_destructor);
 
 	if (port == NBT_SMB_PORT) {
-		subreq = tevent_wakeup_send(state, ev, timeval_set(0, 0));
-		if (tevent_req_nomem(subreq, req)) {
+		state->req_139 = nb_connect_send(state, state->ev, state->addr,
+						 state->called_name,
+						 state->called_type,
+						 state->calling_name,
+						 state->calling_type);
+		if (tevent_req_nomem(state->req_139, req)) {
 			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_connected, req);
 		return req;
 	}
 	if (port != 0) {


-- 
Samba Shared Repository