While poking at something else, I noticed that the logic in initdb
about removing "@remove-line-for-nolocal@" from pg_hba.conf is
useless. Since commit f55808828, it's applied unconditionally;
so we might as well just edit that out of pg_hba.conf.sample and
delete the code to do so during initdb.
This won't save any interesting number of cycles of course, but
I think it's confusing to have that decoration in pg_hba.conf.sample
when it doesn't do anything.
Any objection to the attached?
regards, tom lane
diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample
index b64c8dea97c..475100f8865 100644
--- a/src/backend/libpq/pg_hba.conf.sample
+++ b/src/backend/libpq/pg_hba.conf.sample
@@ -109,14 +109,14 @@
# TYPE DATABASE USER ADDRESS METHOD
-@remove-line-for-nolocal@# "local" is for Unix domain socket connections only
-@remove-line-for-nolocal@local all all @authmethodlocal@
+# "local" is for Unix domain socket connections only
+local all all @authmethodlocal@
# IPv4 local connections:
host all all 127.0.0.1/32 @authmethodhost@
# IPv6 local connections:
host all all ::1/128 @authmethodhost@
# Allow replication connections from localhost, by a user with the
# replication privilege.
-@remove-line-for-nolocal@local replication all @authmethodlocal@
+local replication all @authmethodlocal@
host replication all 127.0.0.1/32 @authmethodhost@
host replication all ::1/128 @authmethodhost@
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index a3980e5535f..7c49dd433a7 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1463,9 +1463,6 @@ setup_config(void)
conflines = readfile(hba_file);
- conflines = replace_token(conflines, "@remove-line-for-nolocal@", "");
-
-
/*
* Probe to see if there is really any platform support for IPv6, and
* comment out the relevant pg_hba line if not. This avoids runtime
