Revert "socket_wrapper: fix connect() for dgram sockets, if the destination isn't...
authorStefan Metzmacher <metze@samba.org>
Sun, 22 Mar 2009 11:36:38 +0000 (12:36 +0100)
committerStefan Metzmacher <metze@samba.org>
Sun, 22 Mar 2009 11:36:38 +0000 (12:36 +0100)
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

lib/socket_wrapper/socket_wrapper.c

index 1d35c8d20ca311bc2f4b8cdf71dd40322dcfb229..44082e78a1e97ca86ac9b1f6cdefe061c66cd8f1 100644 (file)
@@ -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) {