[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-664-g298bff5

[Volker Lendecke]

The branch, master has been updated
       via  298bff5019be5a40dc0023b5af1e980fba91abd9 (commit)
      from  979a1b06d01817a01967d9137e4f70f222fa8eab (commit)

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


- Log -----------------------------------------------------------------
commit 298bff5019be5a40dc0023b5af1e980fba91abd9
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Mar 23 12:05:02 2009 +0100

    Fix connect to port 139 only -- thanks gd for bugging me :-)

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

Summary of changes:
 source3/libsmb/cliconnect.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index ebb01c4..525c361 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1841,10 +1841,9 @@ static NTSTATUS open_smb_socket(const struct sockaddr_storage *pss,
 	tevent_req_set_callback(r445, smb_sock_connected, fd445);
 	tevent_req_set_callback(r139, smb_sock_connected, fd139);
 
-	while ((fd139->fd == -1)
-	       && tevent_req_is_in_progress(r139)
-	       && (fd445->fd == -1)
-	       && tevent_req_is_in_progress(r445)) {
+	while ((fd445->fd == -1) && (fd139->fd == -1)
+	       && (tevent_req_is_in_progress(r139)
+		   || tevent_req_is_in_progress(r445))) {
 		event_loop_once(ev);
 	}
 


-- 
Samba Shared Repository