[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-661-g1f72e4a

[Stefan Metzmacher]

The branch, master has been updated
       via  1f72e4abfdc85fbe624ec7910b68868d97f88ff2 (commit)
      from  8a6f91c910c5f26eef10e959ae8a36a02099cad0 (commit)

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


- Log -----------------------------------------------------------------
commit 1f72e4abfdc85fbe624ec7910b68868d97f88ff2
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Mar 22 12:36:38 2009 +0100

    Revert "socket_wrapper: fix connect() for dgram sockets, if the destination isn't there yet"
    
    This reverts commit 66dc53ee017d74a6f610bbe04337f064901fe2a1.
    
    Somehow this leads to timeouts in some tests, samba4.ldb.ldapi
    and samba4.rpc.schannel. I need to look at it more closely later...
    
    metze

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

Summary of changes:
 lib/socket_wrapper/socket_wrapper.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
index 1d35c8d..44082e7 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -1686,14 +1686,10 @@ _PUBLIC_ int swrap_connect(int s, const struct sockaddr *serv_addr, socklen_t ad
 	ret = sockaddr_convert_to_un(si, (const struct sockaddr *)serv_addr, addrlen, &un_addr, 0, NULL);
 	if (ret == -1) return -1;
 
-	if (si->type == SOCK_DGRAM) {
-		ret = 0;
-	} else {
-		swrap_dump_packet(si, serv_addr, SWRAP_CONNECT_SEND, NULL, 0);
+	swrap_dump_packet(si, serv_addr, SWRAP_CONNECT_SEND, NULL, 0);
 
-		ret = real_connect(s, (struct sockaddr *)&un_addr,
-				   sizeof(struct sockaddr_un));
-	}
+	ret = real_connect(s, (struct sockaddr *)&un_addr, 
+			   sizeof(struct sockaddr_un));
 
 	/* to give better errors */
 	if (ret == -1 && errno == ENOENT) {


-- 
Samba Shared Repository