aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-09-13 16:43:38 +0000
committerBruce Momjian <bruce@momjian.us>2003-09-13 16:43:38 +0000
commitc346ca8648290d2c7d858d903180b321e68c2f5c (patch)
tree32d721f13229ad93c7c5f4893cee7d92d4b5e899 /src
parentd7635e5c4f9e92a7b5e720845a3e301dc81fd11d (diff)
downloadpostgresql-c346ca8648290d2c7d858d903180b321e68c2f5c.tar.gz
postgresql-c346ca8648290d2c7d858d903180b321e68c2f5c.zip
When I sent in the sslmode patch I forgot to update the
comments/examples in pg_hba.conf. This patch remedies that, adds a brief explanation of the connection types, and adds a missing period in the docs. Jon Jensen
Diffstat (limited to 'src')
-rw-r--r--src/backend/libpq/pg_hba.conf.sample17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample
index 946e573ddc9..f4f002b7079 100644
--- a/src/backend/libpq/pg_hba.conf.sample
+++ b/src/backend/libpq/pg_hba.conf.sample
@@ -7,15 +7,20 @@
#
# This file controls: which hosts are allowed to connect, how clients
# are authenticated, which PostgreSQL user names they can use, which
-# databases they can access. Records take one of five forms:
+# databases they can access. Records take one of seven forms:
#
-# local DATABASE USER METHOD [OPTION]
-# host DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
-# hostssl DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
-# host DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
-# hostssl DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
+# local DATABASE USER METHOD [OPTION]
+# host DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
+# hostssl DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
+# hostnossl DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
+# host DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
+# hostssl DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
+# hostnossl DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
#
# (The uppercase quantities should 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.
# DATABASE can be "all", "sameuser", "samegroup", a database name (or
# a comma-separated list thereof), or a file name prefixed with "@".
# USER can be "all", an actual user name or a group name prefixed with