From: Tom Lane <tgl@sss.pgh.pa.us>
To: pgsql-hackers@lists.postgresql.org
Subject: @remove-line-for-nolocal@ is dead code
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
Content-ID: <2287755.1771458139.0@sss.pgh.pa.us>
Date: Wed, 18 Feb 2026 18:42:37 -0500
Message-ID: <2287786.1771458157@sss.pgh.pa.us>
Archived-At: 
 <https://www.postgresql.org/message-id/2287786.1771458157%40sss.pgh.pa.us>
Precedence: bulk

------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <2287755.1771458139.1@sss.pgh.pa.us>

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


------- =_aaaaaaaaaa0
Content-Type: text/x-diff; name="0001-remove-dead-code-for-nolocal.patch";
	charset="us-ascii"
Content-ID: <2287755.1771458139.2@sss.pgh.pa.us>
Content-Description: 0001-remove-dead-code-for-nolocal.patch
Content-Transfer-Encoding: quoted-printable

diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_h=
ba.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                                     @authmeth=
odlocal@
 # IPv4 local connections:
 host    all             all             127.0.0.1/32            @authmeth=
odhost@
 # IPv6 local connections:
 host    all             all             ::1/128                 @authmeth=
odhost@
 # Allow replication connections from localhost, by a user with the
 # replication privilege.
-@remove-line-for-nolocal@local   replication     all                     =
                @authmethodlocal@
+local   replication     all                                     @authmeth=
odlocal@
 host    replication     all             127.0.0.1/32            @authmeth=
odhost@
 host    replication     all             ::1/128                 @authmeth=
odhost@
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 =3D readfile(hba_file);
 =

-	conflines =3D 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

------- =_aaaaaaaaaa0--