Fix recent changes to not break non-IPV6-aware systems.

tglsfdc · tglsfdc · commit 9771125c18c5 · 2010-10-16T10:12:16.000-04:00
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -548,6 +548,8 @@ ipv4eq(struct sockaddr_in *a, struct sockaddr_in *b)
 	return (a->sin_addr.s_addr == b->sin_addr.s_addr);
 }
 
+#ifdef HAVE_IPV6
+
 static bool
 ipv6eq(struct sockaddr_in6 *a, struct sockaddr_in6 *b)
 {
@@ -560,6 +562,8 @@ ipv6eq(struct sockaddr_in6 *a, struct sockaddr_in6 *b)
 	return true;
 }
 
+#endif /* HAVE_IPV6 */
+
 /*
  * Check to see if a connecting IP matches a given host name.
  */
@@ -614,6 +618,7 @@ check_hostname(hbaPort *port, const char *hostname)
 					break;
 				}
 			}
+#ifdef HAVE_IPV6
 			else if (gai->ai_addr->sa_family == AF_INET6)
 			{
 				if (ipv6eq((struct sockaddr_in6 *) gai->ai_addr,
@@ -623,6 +628,7 @@ check_hostname(hbaPort *port, const char *hostname)
 					break;
 				}
 			}
+#endif
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -548,6 +548,8 @@ ipv4eq(struct sockaddr_in a, struct sockaddr_in b)`
`548`	`548`	`return (a->sin_addr.s_addr == b->sin_addr.s_addr);`
`549`	`549`	`}`
`550`	`550`
	`551`	`+#ifdef HAVE_IPV6`
	`552`	`+`
`551`	`553`	`static bool`
`552`	`554`	`ipv6eq(struct sockaddr_in6 a, struct sockaddr_in6 b)`
`553`	`555`	`{`
`@@ -560,6 +562,8 @@ ipv6eq(struct sockaddr_in6 a, struct sockaddr_in6 b)`
`560`	`562`	`return true;`
`561`	`563`	`}`
`562`	`564`
	`565`	`+#endif /* HAVE_IPV6 */`
	`566`	`+`
`563`	`567`	`/*`
`564`	`568`	`* Check to see if a connecting IP matches a given host name.`
`565`	`569`	`*/`
`@@ -614,6 +618,7 @@ check_hostname(hbaPort port, const char hostname)`
`614`	`618`	`break;`
`615`	`619`	`}`
`616`	`620`	`}`
	`621`	`+#ifdef HAVE_IPV6`
`617`	`622`	`else if (gai->ai_addr->sa_family == AF_INET6)`
`618`	`623`	`{`
`619`	`624`	`if (ipv6eq((struct sockaddr_in6 *) gai->ai_addr,`
`@@ -623,6 +628,7 @@ check_hostname(hbaPort port, const char hostname)`
`623`	`628`	`break;`
`624`	`629`	`}`
`625`	`630`	`}`
	`631`	`+#endif`
`626`	`632`	`}`
`627`	`633`	`}`
`628`	`634`