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

Commit 8ec3221

Browse files
committed
Update Win32 wording.
1 parent cf5dd06 commit 8ec3221

File tree

2 files changed

+29
-24
lines changed

2 files changed

+29
-24
lines changed

doc/src/sgml/release.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.289 2004/08/26 13:08:59 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.290 2004/08/26 13:44:38 momjian Exp $
33
-->
44

55
<appendix id="release">
@@ -40,9 +40,9 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.289 2004/08/26 13:08:59 momjian
4040
</para>
4141
<para>
4242
Because Win32 is significantly different from the Unix platforms
43-
supported in previous releases, this port might have more bugs
44-
than other supported platforms in this release. Please test it
45-
thoroughly before using it in production.
43+
supported in previous releases, it has not been tested as
44+
extensively as other supported platforms in this release. Please
45+
test it thoroughly before using it in production.
4646
</para>
4747
<para>
4848
Previous releases required the Unix emulation toolkit Cygwin for

src/backend/libpq/pg_hba.conf.sample

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
# databases they can access. Records take one of seven forms:
1111
#
1212
# local DATABASE USER METHOD [OPTION]
13-
# host DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
14-
# hostssl DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
15-
# hostnossl DATABASE USER IP-ADDRESS IP-MASK METHOD [OPTION]
16-
# host DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
17-
# hostssl DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
18-
# hostnossl DATABASE USER IP-ADDRESS/CIDR-MASK METHOD [OPTION]
13+
# host DATABASE USER CIDR-ADDRESS METHOD [OPTION]
14+
# hostssl DATABASE USER CIDR-ADDRESS METHOD [OPTION]
15+
# hostnossl DATABASE USER CIDR-ADDRESS METHOD [OPTION]
16+
# host DATABASE USER CIDR-ADDRESS METHOD [OPTION]
17+
# hostssl DATABASE USER CIDR-ADDRESS METHOD [OPTION]
18+
# hostnossl DATABASE USER CIDR-ADDRESS METHOD [OPTION]
1919
#
2020
# (The uppercase quantities should be replaced by actual values.)
2121
# The first field is the connection type: "local" is a Unix-domain socket,
@@ -24,16 +24,21 @@
2424
# DATABASE can be "all", "sameuser", "samegroup", a database name (or
2525
# a comma-separated list thereof), or a file name prefixed with "@".
2626
# USER can be "all", an actual user name or a group name prefixed with
27-
# "+" or a list containing either. IP-ADDRESS and IP-MASK specify the
28-
# set of hosts the record matches. CIDR-MASK is an integer between 0
29-
# and 32 (IPv6) or 128(IPv6) inclusive, that specifies the number of
30-
# significant bits in the mask, so an IPv4 CIDR-MASK of 8 is equivalent
31-
# to an IP-MASK of 255.0.0.0, and an IPv6 CIDR-MASK of 64 is equivalent
32-
# to an IP-MASK of ffff:ffff:ffff:ffff::. METHOD can be "trust", "reject",
33-
# "md5", "crypt", "password", "krb4", "krb5", "ident", or "pam". Note
34-
# that "password" uses clear-text passwords; "md5" is preferred for
35-
# encrypted passwords. OPTION is the ident map or the name of the PAM
36-
# service.
27+
# "+" or a list containing either.
28+
#
29+
# CIDR-ADDRESS specifies the set of hosts the record matches.
30+
# It is made up of an IP address and a CIDR mask that is an integer
31+
# between 0 and 32 (IPv6) or 128(IPv6) inclusive, that specifies
32+
# the number of significant bits in the mask, e.g. an IPv4 CIDR mask
33+
# of 8 is equivalent to an IP mask of 255.0.0.0, an IPv6 CIDR mask
34+
# of 64 is equivalent to an IP mask of ffff:ffff:ffff:ffff::. A
35+
# IPv4 CIDR mask of 32 is used for single hosts. Also, you can use a
36+
# separate IP address and netmask to specify the set of hosts.
37+
#
38+
# METHOD can be "trust", "reject", "md5", "crypt", "password",
39+
# "krb4", "krb5", "ident", or "pam". Note that "password" uses
40+
# clear-text passwords; "md5" is preferred for encrypted passwords.
41+
# OPTION is the ident map or the name of the PAM service.
3742
#
3843
# Database and user names containing spaces, commas, quotes and other special
3944
# characters can be quoted. Quoting one of the keywords "all", "sameuser" or
@@ -56,10 +61,10 @@
5661

5762
@authcomment@
5863

59-
# TYPE DATABASE USER IP-ADDRESS IP-MASK METHOD
64+
# TYPE DATABASE USER CIDR-ADDRESS METHOD
6065

61-
local all all @authmethod@
66+
local all all @authmethod@
6267
# IPv4-style local connections:
63-
host all all 127.0.0.1/32 @authmethod@
68+
host all all 127.0.0.1/32 @authmethod@
6469
# IPv6-style local connections:
65-
host all all ::1/128 @authmethod@
70+
host all all ::1/128 @authmethod@

0 commit comments

Comments
 (0)