Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jR415-0003Y0-Fk for pgsql-bugs@arkaria.postgresql.org; Wed, 22 Apr 2020 01:17:31 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jR414-0006ti-CG for pgsql-bugs@arkaria.postgresql.org; Wed, 22 Apr 2020 01:17:30 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jR414-0006ta-4X for pgsql-bugs@lists.postgresql.org; Wed, 22 Apr 2020 01:17:30 +0000 Received: from momjian.us ([72.94.173.45]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jR40z-0002aE-Fo for pgsql-bugs@lists.postgresql.org; Wed, 22 Apr 2020 01:17:27 +0000 Received: from bruce by momjian.us with local (Exim 4.92) (envelope-from ) id 1jR40w-00075Y-RT; Tue, 21 Apr 2020 21:17:22 -0400 Date: Tue, 21 Apr 2020 21:17:22 -0400 From: Bruce Momjian To: Arthur Nascimento Cc: pgsql-bugs@lists.postgresql.org Subject: Re: BUG #16380: documentation: host[no]gssenc vs. address/IP-address/IP-mask fields Message-ID: <20200422011722.GL19613@momjian.us> References: <16380-45bf493d620bc29c@postgresql.org> <20200421182736.GG19613@momjian.us> <20200421190822.GJ19613@momjian.us> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="9dgjiU4MmWPVapMU" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --9dgjiU4MmWPVapMU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Apr 21, 2020 at 04:43:19PM -0300, Arthur Nascimento wrote: > > On Tue, 21 Apr 2020 at 16:08, Bruce Momjian wrote: > > > Ah, I see. Updated patch attached. > > > > That looks perfect. Thank you! > > Oh, there might be another line to change in the 'address' column. > I see you changed the one under 'IP-address/IP-mask' that starts with > "These fields...". > But there is a similar one under 'address', that starts with "This field...". Agreed, fixed. -- Bruce Momjian 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 + --9dgjiU4MmWPVapMU Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="hba.diff" diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml index 5f1eec78fb..eb0e6a8873 100644 --- a/doc/src/sgml/client-auth.sgml +++ b/doc/src/sgml/client-auth.sgml @@ -99,17 +99,19 @@ - A record can have one of the seven formats + A record can have one of the 11 formats -local database user auth-method auth-options -host database user address auth-method auth-options -hostssl database user address auth-method auth-options -hostnossl database user address auth-method auth-options -host database user IP-address IP-mask auth-method auth-options -hostssl database user IP-address IP-mask auth-method auth-options -hostnossl database user IP-address IP-mask auth-method auth-options -hostgssenc database user IP-address IP-mask auth-method auth-options -hostnogssenc database user IP-address IP-mask auth-method auth-options +local database user auth-method auth-options +host database user address auth-method auth-options +hostssl database user address auth-method auth-options +hostnossl database user address auth-method auth-options +hostgssenc database user address auth-method auth-options +hostnogssenc database user address auth-method auth-options +host database user IP-address IP-mask auth-method auth-options +hostssl database user IP-address IP-mask auth-method auth-options +hostnossl database user IP-address IP-mask auth-method auth-options +hostgssenc database user IP-address IP-mask auth-method auth-options +hostnogssenc database user IP-address IP-mask auth-method auth-options The meaning of the fields is as follows: @@ -356,8 +358,7 @@ hostnogssenc database user - This field only applies to host, - hostssl, and hostnossl records. + These fields do not apply to local records. @@ -409,8 +410,7 @@ hostnogssenc database user - These fields only apply to host, - hostssl, and hostnossl records. + These fields do not apply to local records. diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample index 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" --9dgjiU4MmWPVapMU--