* Fixed bug in webcit-to-citadel IPv6/IPv4 connectivity

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 67976f19fb6ddd8b453af9410fffceab821ef5af..5e232c98da542b729a0407a17dd0fdad7519ff4e 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -100,7 +100,7 @@ int sock_connect(char *host, char *service)
                        CtdlLogPrintf(CTDL_ERR, "socket() failed: %s\n", strerror(errno));
                        return(-1);
                }
-               rc = connect(sock, res->ai_addr, res->ai_addrlen);
+               rc = connect(sock, ai->ai_addr, ai->ai_addrlen);
                if (rc >= 0) {
                        return(sock);
                }

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index fa37c18d3a7ff42f0264cb8f4e02427480f54144..2079e6498f7fcba2d653fc3173d325b71c70562b 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -129,7 +129,7 @@ int tcp_connectsock(char *host, char *service)
                        lprintf(1, "socket() failed: %s\n", strerror(errno));
                        return(-1);
                }
-               rc = connect(s, res->ai_addr, res->ai_addrlen);
+               rc = connect(s, ai->ai_addr, ai->ai_addrlen);
                if (rc >= 0) {
                        return(s);
                }