summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-03-22 12:36:38 +0100
committerStefan Metzmacher <metze@samba.org>2009-03-22 12:36:38 +0100
commit1f72e4abfdc85fbe624ec7910b68868d97f88ff2 (patch)
treef7e35f37b7a262ca47e134c4a51cf22bf6533f76
parent8a6f91c910c5f26eef10e959ae8a36a02099cad0 (diff)
downloadsamba-1f72e4abfdc85fbe624ec7910b68868d97f88ff2.tar.gz
samba-1f72e4abfdc85fbe624ec7910b68868d97f88ff2.tar.bz2
samba-1f72e4abfdc85fbe624ec7910b68868d97f88ff2.zip
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
-rw-r--r--lib/socket_wrapper/socket_wrapper.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
index 1d35c8d20c..44082e78a1 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) {