[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-562-gc96d0ff

[Volker Lendecke]

The branch, v3-4-test has been updated
       via  c96d0ffd944f536a1228812c761ba4fb4313ee05 (commit)
      from  89cb10430c30c9e59a5305210b7f09346b360c42 (commit)

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


- Log -----------------------------------------------------------------
commit c96d0ffd944f536a1228812c761ba4fb4313ee05
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 :-)
    (cherry picked from commit 298bff5019be5a40dc0023b5af1e980fba91abd9)

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

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