summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-06-27 10:44:14 +0000
committerAndrew Tridgell <tridge@samba.org>2001-06-27 10:44:14 +0000
commitc6f647dfd9dff2e9681f084b01cc7267b779f8fd (patch)
treeefa75bebb08d6be43a95ccb8b6d1f16306c78ea1
parenta0b75f7da77673ad1193c6f7e28fd7ae38769ba5 (diff)
downloadsamba-c6f647dfd9dff2e9681f084b01cc7267b779f8fd.tar.gz
samba-c6f647dfd9dff2e9681f084b01cc7267b779f8fd.tar.bz2
samba-c6f647dfd9dff2e9681f084b01cc7267b779f8fd.zip
handle EISCONN in socketpair_tcp
this should get the auto-tests working on IRIX (This used to be commit 87f90d48d857828a6ed12bdc58d0d881be45dfce)
-rw-r--r--source3/lib/util_sock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 7f8b83ec7d..d7bef0697e 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -1185,7 +1185,8 @@ static int socketpair_tcp(int fd[2])
close(listener);
if (connect_done == 0) {
- if (connect(fd[1],(struct sockaddr *)&sock,sizeof(sock)) != 0) goto failed;
+ if (connect(fd[1],(struct sockaddr *)&sock,sizeof(sock)) != 0
+ && errno != EISCONN) goto failed;
}
set_blocking(fd[1], 1);