X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/974f27e7e9844f483b5eb74c2f09e37f3f294462..355b8bcd73745553449c6666abf92326590af9a4:/clientname.c

diff --git a/clientname.c b/clientname.c
index 41bdeda9..579089f9 100644
--- a/clientname.c
+++ b/clientname.c
@@ -200,12 +200,18 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
 		sin1 = (const struct sockaddr_in *) ss;
 		sin2 = (const struct sockaddr_in *) ai->ai_addr;
 		
-		return memcmp(sin1, sin2, sizeof *sin1);
+		return memcmp(&sin1->sin_addr, &sin2->sin_addr,
+			      sizeof sin1->sin_addr);
 	}
 #ifdef INET6
 	else if (ss_family == AF_INET6) {
-		/* XXXX */
-		return 1;
+		const struct sockaddr_in6 *sin1, *sin2;
+
+		sin1 = (const struct sockaddr_in6 *) ss;
+		sin2 = (const struct sockaddr_in6 *) ai->ai_addr;
+		
+		return memcmp(&sin1->sin6_addr, &sin2->sin6_addr,
+			      sizeof sin1->sin6_addr);
 	}
 #endif /* INET6 */
 	else {
@@ -232,8 +238,8 @@ int check_name(int fd,
 	int ss_family = get_sockaddr_family(ss);
 
 	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = PF_UNSPEC;
-	hints.ai_flags = ss_family;
+	hints.ai_family = ss_family;
+	hints.ai_flags = AI_CANONNAME;
 	hints.ai_socktype = SOCK_STREAM;
 	error = getaddrinfo(name_buf, port_buf, &hints, &res0);
 	if (error) {