fixed socketpair_tcp for OpenBSD

(This used to be commit d99ce6a5e3455ed38ca3c1ac676b5048edf8c706)

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index ccbc86bb0bd6eee61c61bd66d43e11a5f8220424..01cff85f653440e7489332bace465fd73a3a572a 100644 (file)
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -1156,7 +1156,7 @@ the resulting file descriptors are symmetrical
 static int socketpair_tcp(int fd[2])
 {
        int listener;
-       struct sockaddr sock;
+       struct sockaddr_in sock;
        struct sockaddr_in sock2;
        socklen_t socklen = sizeof(sock);
        int connect_done = 0;
@@ -1177,19 +1177,21 @@ static int socketpair_tcp(int fd[2])
 
        if (listen(listener, 1) != 0) goto failed;
 
-       if (getsockname(listener, &sock, &socklen) != 0) goto failed;
+       if (getsockname(listener, (struct sockaddr *)&sock, &socklen) != 0) goto failed;
 
        if ((fd[1] = socket(PF_INET, SOCK_STREAM, 0)) == -1) goto failed;
 
        set_blocking(fd[1], 0);
 
+       sock.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
        if (connect(fd[1],(struct sockaddr *)&sock,sizeof(sock)) == -1) {
                if (errno != EINPROGRESS) goto failed;
        } else {
                connect_done = 1;
        }
 
-       if ((fd[0] = accept(listener, &sock, &socklen)) == -1) goto failed;
+       if ((fd[0] = accept(listener, (struct sockaddr *)&sock, &socklen)) == -1) goto failed;
 
        close(listener);
        if (connect_done == 0) {
@@ -1220,7 +1222,10 @@ attached to the original stderr
 int sock_exec(const char *prog)
 {
        int fd[2];
-       if (socketpair_tcp(fd) != 0) return -1;
+       if (socketpair_tcp(fd) != 0) {
+               DEBUG(0,("socketpair_tcp failed (%s)\n", strerror(errno)));
+               return -1;
+       }
        if (fork() == 0) {
                close(fd[0]);
                close(0);