From 2f248ad573ce30e6847318ce4ea5eec3f747cbda Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 19 Feb 2026 11:08:52 -0500 Subject: [PATCH] Remove no-longer-useful markers in pg_hba.conf.sample. The source version of pg_hba.conf.sample contains @remove-line-for-nolocal@ markers that indicate which lines should be deleted for an installation that doesn't HAVE_UNIX_SOCKETS. We no longer support that case, and since commit f55808828 all that initdb is doing is unconditionally removing the markers. We might as well remove the markers from the source version and drop the removal code, which is unintelligible now anyway. This will not of course save any noticeable number of cycles in initdb, but it might save some confusion for future developers looking at pg_hba.conf.sample. It also reduces the number of distinct cases that replace_token() has to support, possibly allowing some tightening of that function. Discussion: https://postgr.es/m/2287786.1771458157@sss.pgh.pa.us --- src/backend/libpq/pg_hba.conf.sample | 6 +++--- src/bin/initdb/initdb.c | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) 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