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

Commit 525d2cb

Browse files
committed
Reformat the comments in pg_hba.conf and pg_ident.conf
These files have apparently been edited over the years by a dozen people with as many different editor settings, which made the alignment of the paragraphs quite inconsistent and ugly. I made a pass of M-q with Emacs to straighten it out.
1 parent fd7673b commit 525d2cb

File tree

3 files changed

+59
-54
lines changed

3 files changed

+59
-54
lines changed

src/backend/libpq/pg_hba.conf.sample

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# PostgreSQL Client Authentication Configuration File
22
# ===================================================
33
#
4-
# Refer to the "Client Authentication" section in the
5-
# PostgreSQL documentation for a complete description
6-
# of this file. A short synopsis follows.
4+
# Refer to the "Client Authentication" section in the PostgreSQL
5+
# documentation for a complete description of this file. A short
6+
# synopsis follows.
77
#
88
# This file controls: which hosts are allowed to connect, how clients
99
# are authenticated, which PostgreSQL user names they can use, which
@@ -16,54 +16,57 @@
1616
#
1717
# (The uppercase items must be replaced by actual values.)
1818
#
19-
# The first field is the connection type: "local" is a Unix-domain socket,
20-
# "host" is either a plain or SSL-encrypted TCP/IP socket, "hostssl" is an
21-
# SSL-encrypted TCP/IP socket, and "hostnossl" is a plain TCP/IP socket.
19+
# The first field is the connection type: "local" is a Unix-domain
20+
# socket, "host" is either a plain or SSL-encrypted TCP/IP socket,
21+
# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a
22+
# plain TCP/IP socket.
2223
#
23-
# DATABASE can be "all", "sameuser", "samerole", "replication",
24-
# a database name, or a comma-separated list thereof.
24+
# DATABASE can be "all", "sameuser", "samerole", "replication", a
25+
# database name, or a comma-separated list thereof.
2526
#
26-
# USER can be "all", a user name, a group name prefixed with "+", or
27-
# a comma-separated list thereof. In both the DATABASE and USER fields
28-
# you can also write a file name prefixed with "@" to include names from
29-
# a separate file.
27+
# USER can be "all", a user name, a group name prefixed with "+", or a
28+
# comma-separated list thereof. In both the DATABASE and USER fields
29+
# you can also write a file name prefixed with "@" to include names
30+
# from a separate file.
3031
#
31-
# CIDR-ADDRESS specifies the set of hosts the record matches.
32-
# It is made up of an IP address and a CIDR mask that is an integer
33-
# (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that specifies
34-
# the number of significant bits in the mask. Alternatively, you can write
35-
# an IP address and netmask in separate columns to specify the set of hosts.
36-
# Instead of a CIDR-address, you can write "samehost" to match any of the
37-
# server's own IP addresses, or "samenet" to match any address in any subnet
38-
# that the server is directly connected to.
32+
# CIDR-ADDRESS specifies the set of hosts the record matches. It is
33+
# made up of an IP address and a CIDR mask that is an integer (between
34+
# 0 and 32 (IPv4) or 128 (IPv6) inclusive) that specifies the number
35+
# of significant bits in the mask. Alternatively, you can write an IP
36+
# address and netmask in separate columns to specify the set of hosts.
37+
# Instead of a CIDR-address, you can write "samehost" to match any of
38+
# the server's own IP addresses, or "samenet" to match any address in
39+
# any subnet that the server is directly connected to.
3940
#
40-
# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi", "krb5",
41-
# "ident", "pam", "ldap" or "cert". Note that "password" sends passwords
42-
# in clear text; "md5" is preferred since it sends encrypted passwords.
41+
# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi",
42+
# "krb5", "ident", "pam", "ldap" or "cert". Note that "password"
43+
# sends passwords in clear text; "md5" is preferred since it sends
44+
# encrypted passwords.
4345
#
4446
# OPTIONS are a set of options for the authentication in the format
45-
# NAME=VALUE. The available options depend on the different authentication
46-
# methods - refer to the "Client Authentication" section in the documentation
47-
# for a list of which options are available for which authentication methods.
47+
# NAME=VALUE. The available options depend on the different
48+
# authentication methods -- refer to the "Client Authentication"
49+
# section in the documentation for a list of which options are
50+
# available for which authentication methods.
4851
#
49-
# Database and user names containing spaces, commas, quotes and other special
50-
# characters must be quoted. Quoting one of the keywords "all", "sameuser",
51-
# "samerole" or "replication" makes the name lose its special character,
52-
# and just match a database or username with that name.
52+
# Database and user names containing spaces, commas, quotes and other
53+
# special characters must be quoted. Quoting one of the keywords
54+
# "all", "sameuser", "samerole" or "replication" makes the name lose
55+
# its special character, and just match a database or username with
56+
# that name.
5357
#
5458
# This file is read on server startup and when the postmaster receives
5559
# a SIGHUP signal. If you edit the file on a running system, you have
56-
# to SIGHUP the postmaster for the changes to take effect. You can use
57-
# "pg_ctl reload" to do that.
60+
# to SIGHUP the postmaster for the changes to take effect. You can
61+
# use "pg_ctl reload" to do that.
5862

5963
# Put your actual configuration here
6064
# ----------------------------------
6165
#
6266
# If you want to allow non-local connections, you need to add more
63-
# "host" records. In that case you will also need to make PostgreSQL listen
64-
# on a non-local interface via the listen_addresses configuration parameter,
65-
# or via the -i or -h command line switches.
66-
#
67+
# "host" records. In that case you will also need to make PostgreSQL
68+
# listen on a non-local interface via the listen_addresses
69+
# configuration parameter, or via the -i or -h command line switches.
6770

6871
@authcomment@
6972

src/backend/libpq/pg_ident.conf.sample

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# PostgreSQL User Name Maps
22
# =========================
33
#
4-
# Refer to the PostgreSQL Administrator's Guide, chapter "Client
5-
# Authentication" for a complete description. A short synopsis follows.
4+
# Refer to the PostgreSQL documentation, chapter "Client
5+
# Authentication" for a complete description. A short synopsis
6+
# follows.
67
#
7-
# This file controls PostgreSQL username mapping. It maps
8-
# external user names to their corresponding
9-
# PostgreSQL user names. Records are of the form:
8+
# This file controls PostgreSQL user name mapping. It maps external
9+
# user names to their corresponding PostgreSQL user names. Records
10+
# are of the form:
1011
#
1112
# MAPNAME SYSTEM-USERNAME PG-USERNAME
1213
#
@@ -18,21 +19,22 @@
1819
# existence of a record specifies that SYSTEM-USERNAME may connect as
1920
# PG-USERNAME.
2021
#
21-
# If SYSTEM-USERNAME starts with a slash (/), it will be treated as
22-
# a regular expression. Optionally this can contain a capture (a
22+
# If SYSTEM-USERNAME starts with a slash (/), it will be treated as a
23+
# regular expression. Optionally this can contain a capture (a
2324
# parenthesized subexpression). The substring matching the capture
24-
# will be substituted for \1 (backslash-one) if present in PG-USERNAME.
25+
# will be substituted for \1 (backslash-one) if present in
26+
# PG-USERNAME.
2527
#
2628
# Multiple maps may be specified in this file and used by pg_hba.conf.
2729
#
28-
# No map names are defined in the default configuration. If all system
29-
# user names and PostgreSQL user names are the same, you don't need
30-
# anything in this file.
30+
# No map names are defined in the default configuration. If all
31+
# system user names and PostgreSQL user names are the same, you don't
32+
# need anything in this file.
3133
#
3234
# This file is read on server startup and when the postmaster receives
3335
# a SIGHUP signal. If you edit the file on a running system, you have
34-
# to SIGHUP the postmaster for the changes to take effect. You can use
35-
# "pg_ctl reload" to do that.
36+
# to SIGHUP the postmaster for the changes to take effect. You can
37+
# use "pg_ctl reload" to do that.
3638

3739
# Put your actual configuration here
3840
# ----------------------------------

src/bin/initdb/initdb.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* Portions Copyright (c) 1994, Regents of the University of California
4343
* Portions taken from FreeBSD.
4444
*
45-
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.182 2010/01/06 23:23:51 momjian Exp $
45+
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.183 2010/01/26 06:58:39 petere Exp $
4646
*
4747
*-------------------------------------------------------------------------
4848
*/
@@ -120,10 +120,10 @@ static int n_buffers = 50;
120120
* Warning messages for authentication methods
121121
*/
122122
#define AUTHTRUST_WARNING \
123-
"# CAUTION: Configuring the system for local \"trust\" authentication allows\n" \
124-
"# any local user to connect as any PostgreSQL user, including the database\n" \
125-
"# superuser. If you do not trust all your local users, use another\n" \
126-
"# authentication method.\n"
123+
"# CAUTION: Configuring the system for local \"trust\" authentication\n" \
124+
"# allows any local user to connect as any PostgreSQL user, including\n" \
125+
"# the database superuser. If you do not trust all your local users,\n" \
126+
"# use another authentication method.\n"
127127
static char *authwarning = NULL;
128128

129129
/*

0 commit comments

Comments
 (0)