From: Art Cancro <ajc@citadel.org>
Date: Mon, 23 Aug 2010 04:56:41 +0000 (+0000)
Subject: * Fixed bug in webcit-to-citadel IPv6/IPv4 connectivity
X-Git-Tag: v8.01~859
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=8a5f57f5ee1b7407fd2317b821cdc9e4f7e8fca9

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

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 67976f19f..5e232c98d 100644
--- 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 fa37c18d3..2079e6498 100644
--- 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);
 		}