From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 10 Mar 2017 17:17:56 +0000 (-0500)
Subject: Un-break things on IPv6-less platforms.
X-Git-Tag: REL_10_BETA1~690
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a83e4b4f31c7afa5f7360086ebb1916cc99a4dbe;p=thirdparty%2Fpostgresql.git

Un-break things on IPv6-less platforms.

Commit be37c2120 forgot to teach initdb about commenting out the IPv6
replication entry that it caused to exist in pg_hba.conf.sample.
Per buildfarm.
---

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 8bca635a3bc..3f836efc20f 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1213,15 +1213,23 @@ setup_config(void)
 
 		if (err != 0 ||
 			getaddrinfo("::1", NULL, &hints, &gai_result) != 0)
+		{
 			conflines = replace_token(conflines,
 							   "host    all             all             ::1",
 							 "#host    all             all             ::1");
+			conflines = replace_token(conflines,
+							   "host    replication     all             ::1",
+							 "#host    replication     all             ::1");
+		}
 	}
 #else							/* !HAVE_IPV6 */
 	/* If we didn't compile IPV6 support at all, always comment it out */
 	conflines = replace_token(conflines,
 							  "host    all             all             ::1",
 							  "#host    all             all             ::1");
+	conflines = replace_token(conflines,
+							  "host    replication     all             ::1",
+							  "#host    replication     all             ::1");
 #endif   /* HAVE_IPV6 */
 
 	/* Replace default authentication methods */