Skip to content

Commit ff6783c

Browse files
committed
Doc: clarify description of regexp fields in pg_ident.conf.
The grammar was a little shaky and confusing here, so word-smith it a bit. Also, adjust the comments in pg_ident.conf.sample to use the same terminology as the SGML docs, in particular "DATABASE-USERNAME" not "PG-USERNAME". Back-patch appropriate subsets. I did not risk changing pg_ident.conf.sample in released branches, but it still seems OK to change it in v18. Reported-by: Alexey Shishkin <alexey.shishkin@enterprisedb.com> Author: Tom Lane <tgl@sss.pgh.pa.us> Reviewed-by: David G. Johnston <david.g.johnston@gmail.com> Discussion: https://postgr.es/m/175206279327.3157504.12519088928605422253@wrigleys.postgresql.org Backpatch-through: 13
1 parent 5db55e1 commit ff6783c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

doc/src/sgml/client-auth.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -962,8 +962,9 @@ local db1,db2,@demodbs all md5
962962
the remainder of the field is treated as a regular expression.
963963
(See <xref linkend="posix-syntax-details"/> for details of
964964
<productname>PostgreSQL</productname>'s regular expression syntax.) The regular
965-
expression can include a single capture, or parenthesized subexpression,
966-
which can then be referenced in the <replaceable>database-username</replaceable>
965+
expression can include a single capture, or parenthesized subexpression.
966+
The portion of the system user name that matched the capture can then
967+
be referenced in the <replaceable>database-username</replaceable>
967968
field as <literal>\1</literal> (backslash-one). This allows the mapping of
968969
multiple user names in a single line, which is particularly useful for
969970
simple syntax substitutions. For example, these entries
@@ -981,12 +982,11 @@ mymap /^(.*)@otherdomain\.com$ guest
981982
<para>
982983
If the <replaceable>database-username</replaceable> field starts with
983984
a slash (<literal>/</literal>), the remainder of the field is treated
984-
as a regular expression (see <xref linkend="posix-syntax-details"/>
985-
for details of <productname>PostgreSQL</productname>'s regular
986-
expression syntax). It is not possible to use <literal>\1</literal>
987-
to use a capture from regular expression on
988-
<replaceable>system-username</replaceable> for a regular expression
989-
on <replaceable>database-username</replaceable>.
985+
as a regular expression.
986+
When the <replaceable>database-username</replaceable> field is a regular
987+
expression, it is not possible to use <literal>\1</literal> within it to
988+
refer to a capture from the <replaceable>system-username</replaceable>
989+
field.
990990
</para>
991991

992992
<tip>

0 commit comments

Comments
 (0)