From: Bruce Momjian <bruce@momjian.us>
To: Arthur Nascimento <tureba@gmail.com>
Cc: pgsql-bugs@lists.postgresql.org
Subject: Re: BUG #16380: documentation: host[no]gssenc vs. address/IP-address/IP-mask fields
Date: Tue, 21 Apr 2020 15:08:22 -0400
Message-ID: <20200421190822.GJ19613@momjian.us> (raw)
In-Reply-To: <CALVFHFYnXzkdLwCsqOw5zb9mD0=irQpO6U+D1qveu8WFo2A_Hg@mail.gmail.com>
References: <16380-45bf493d620bc29c@postgresql.org>
<20200421182736.GG19613@momjian.us>
<CALVFHFYnXzkdLwCsqOw5zb9mD0=irQpO6U+D1qveu8WFo2A_Hg@mail.gmail.com>
On Tue, Apr 21, 2020 at 03:45:47PM -0300, Arthur Nascimento wrote:
> Hi Bruce,
>
> On Tue, 21 Apr 2020 at 15:27, Bruce Momjian <bruce@momjian.us> wrote:
> > > 1. Near the top, there's a line saying "A record can have one of the seven
> > > formats", then the followup list shows 9 formats. The ones on host[no]gssenc
> > > were added to the IP-address/IP-mask section, but not to the address
> > > section. I believe the intention was to have 11 lines there, with a
> > > corresponding count at the top.
> ...
> > I agree with your suggestions. I also noticed that pg_hba.conf is
> > missing gssapi entries too, so I added them to the attached patch. too.
>
> I thought the list would jump to 11 lines there, meaning 1 local plus
> 5 on address plus 5 on IP-address/IP-mask.
> As it stands now with 9 lines, it's 1 local plus 3 on address (it's
> missing the two on host[no]gssenc) plus 5 on IP-address/IP-mask.
Ah, I see. Updated patch attached.
--
Bruce Momjian <bruce@momjian.us> https://momjian.us
EnterpriseDB https://enterprisedb.com
+ As you are, so once was I. As I am, so you will be. +
+ Ancient Roman grave inscription +
Attachments:hba.diff (text/x-diff, 6.9K) downloaddiff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgmlindex 5f1eec78fb..21a7906751 100644--- a/doc/src/sgml/client-auth.sgml+++ b/doc/src/sgml/client-auth.sgml@@ -99,17 +99,19 @@
</para>
<para>
- A record can have one of the seven formats+ A record can have one of the 11 formats
<synopsis>
-local <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>-host <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>-hostssl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>-hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>-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>-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>-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>-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>-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>+local <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>+host <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>+hostssl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>+hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>+hostgssenc <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>+hostnogssenc <replaceable>database</replaceable> <replaceable>user</replaceable> <replaceable>address</replaceable> <replaceable>auth-method</replaceable> <optional><replaceable>auth-options</replaceable></optional>+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>+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>+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>+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>+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>
</synopsis>
The meaning of the fields is as follows:
@@ -409,8 +411,7 @@ hostnogssenc <replaceable>database</replaceable> <replaceable>user</replaceable
</para>
<para>
- These fields only apply to <literal>host</literal>,- <literal>hostssl</literal>, and <literal>hostnossl</literal> records.+ These fields do not apply to <literal>local</literal> records.
</para>
</listitem>
</varlistentry>
diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sampleindex c853e36232..2d76992886 100644--- a/src/backend/libpq/pg_hba.conf.sample+++ b/src/backend/libpq/pg_hba.conf.sample@@ -9,17 +9,21 @@
# are authenticated, which PostgreSQL user names they can use, which
# databases they can access. Records take one of these forms:
#
-# local DATABASE USER METHOD [OPTIONS]-# host DATABASE USER ADDRESS METHOD [OPTIONS]-# hostssl DATABASE USER ADDRESS METHOD [OPTIONS]-# hostnossl DATABASE USER ADDRESS METHOD [OPTIONS]+# local DATABASE USER METHOD [OPTIONS]+# host DATABASE USER ADDRESS METHOD [OPTIONS]+# hostssl DATABASE USER ADDRESS METHOD [OPTIONS]+# hostnossl DATABASE USER ADDRESS METHOD [OPTIONS]+# hostgssenc DATABASE USER ADDRESS METHOD [OPTIONS]+# hostnogssenc DATABASE USER ADDRESS METHOD [OPTIONS]
#
# (The uppercase items must be replaced by actual values.)
#
# The first field is the connection type: "local" is a Unix-domain
# socket, "host" is either a plain or SSL-encrypted TCP/IP socket,
# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a
-# plain TCP/IP socket.+# non-SSL TCP/IP socket. Similarly, "hostgssenc" uses a +# GSSAPI-encrypted TCP/IP socket, while "hostnogssenc" uses a+# non-GSSAPI socket.
#
# DATABASE can be "all", "sameuser", "samerole", "replication", a
# database name, or a comma-separated list thereof. The "all"
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-bugs@postgresql.org
Cc: bruce@momjian.us, tureba@gmail.com, pgsql-bugs@lists.postgresql.org
Subject: Re: BUG #16380: documentation: host[no]gssenc vs. address/IP-address/IP-mask fields
In-Reply-To: <20200421190822.GJ19613@momjian.us>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox