Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ac5852f

Browse files
committed
gss: add missing references to hostgssenc and hostnogssenc
These were missed when these were added to pg_hba.conf in PG 12; updates docs and pg_hba.conf.sample. Reported-by: Arthur Nascimento Bug: 16380 Discussion: https://postgr.es/m/20200421182736.GG19613@momjian.us Backpatch-through: 12
1 parent 587322d commit ac5852f

File tree

2 files changed

+23
-19
lines changed

2 files changed

+23
-19
lines changed

doc/src/sgml/client-auth.sgml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,19 @@
9999
</para>
100100

101101
<para>
102-
A record can have one of the seven formats
102+
A record can have several formats:
103103
<synopsis>
104-
local <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
105-
host <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
106-
hostssl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
107-
hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
108-
host <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>IP-address</replaceable> <replaceable>IP-mask</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
109-
hostssl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>IP-address</replaceable> <replaceable>IP-mask</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
110-
hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>IP-address</replaceable> <replaceable>IP-mask</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
111-
hostgssenc <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>IP-address</replaceable> <replaceable>IP-mask</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
112-
hostnogssenc <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>IP-address</replaceable> <replaceable>IP-mask</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
104+
local <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
105+
host <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
106+
hostssl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
107+
hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
108+
hostgssenc <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
109+
hostnogssenc <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
110+
host <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>IP-address</replaceable> <replaceable>IP-mask</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
111+
hostssl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>IP-address</replaceable> <replaceable>IP-mask</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
112+
hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>IP-address</replaceable> <replaceable>IP-mask</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
113+
hostgssenc <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>IP-address</replaceable> <replaceable>IP-mask</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
114+
hostnogssenc <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>IP-address</replaceable> <replaceable>IP-mask</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>
113115
</synopsis>
114116
The meaning of the fields is as follows:
115117

@@ -356,8 +358,7 @@ hostnogssenc <replaceable>database</replaceable> <replaceable>user</replaceable
356358
</para>
357359

358360
<para>
359-
This field only applies to <literal>host</literal>,
360-
<literal>hostssl</literal>, and <literal>hostnossl</literal> records.
361+
These fields do not apply to <literal>local</literal> records.
361362
</para>
362363

363364
<note>
@@ -409,8 +410,7 @@ hostnogssenc <replaceable>database</replaceable> <replaceable>user</replaceable
409410
</para>
410411

411412
<para>
412-
These fields only apply to <literal>host</literal>,
413-
<literal>hostssl</literal>, and <literal>hostnossl</literal> records.
413+
These fields do not apply to <literal>local</literal> records.
414414
</para>
415415
</listitem>
416416
</varlistentry>

src/backend/libpq/pg_hba.conf.sample

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,21 @@
99
# are authenticated, which PostgreSQL user names they can use, which
1010
# databases they can access. Records take one of these forms:
1111
#
12-
# local DATABASE USER METHOD [OPTIONS]
13-
# host DATABASE USER ADDRESS METHOD [OPTIONS]
14-
# hostssl DATABASE USER ADDRESS METHOD [OPTIONS]
15-
# hostnossl DATABASE USER ADDRESS METHOD [OPTIONS]
12+
# local DATABASE USER METHOD [OPTIONS]
13+
# host DATABASE USER ADDRESS METHOD [OPTIONS]
14+
# hostssl DATABASE USER ADDRESS METHOD [OPTIONS]
15+
# hostnossl DATABASE USER ADDRESS METHOD [OPTIONS]
16+
# hostgssenc DATABASE USER ADDRESS METHOD [OPTIONS]
17+
# hostnogssenc DATABASE USER ADDRESS METHOD [OPTIONS]
1618
#
1719
# (The uppercase items must be replaced by actual values.)
1820
#
1921
# The first field is the connection type: "local" is a Unix-domain
2022
# socket, "host" is either a plain or SSL-encrypted TCP/IP socket,
2123
# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a
22-
# plain TCP/IP socket.
24+
# non-SSL TCP/IP socket. Similarly, "hostgssenc" uses a
25+
# GSSAPI-encrypted TCP/IP socket, while "hostnogssenc" uses a
26+
# non-GSSAPI socket.
2327
#
2428
# DATABASE can be "all", "sameuser", "samerole", "replication", a
2529
# database name, or a comma-separated list thereof. The "all"

0 commit comments

Comments
 (0)