database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-26 01:22:12 +03:00
Code Activity

Reformat the comments in pg_hba.conf and pg_ident.conf

Browse Source 
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.
This commit is contained in:
Peter Eisentraut
2010-01-26 06:58:39 +00:00
parent fd7673bc4e
commit 525d2cbba2
3 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/backend/libpq/pg_hba.conf.sample
View File

@ -1,9 +1,9 @@
# PostgreSQL Client Authentication Configuration File # PostgreSQL Client Authentication Configuration File
# =================================================== # ===================================================
# #
# Refer to the "Client Authentication" section in the # Refer to the "Client Authentication" section in the PostgreSQL
# PostgreSQL documentation for a complete description # documentation for a complete description of this file. A short
# of this file. A short synopsis follows. # synopsis follows.
# #
# This file controls: which hosts are allowed to connect, how clients # This file controls: which hosts are allowed to connect, how clients
# are authenticated, which PostgreSQL user names they can use, which # are authenticated, which PostgreSQL user names they can use, which
@ -16,54 +16,57 @@
# #
# (The uppercase items must be replaced by actual values.) # (The uppercase items must be replaced by actual values.)
# #
# The first field is the connection type: "local" is a Unix-domain socket, # The first field is the connection type: "local" is a Unix-domain
# "host" is either a plain or SSL-encrypted TCP/IP socket, "hostssl" is an # socket, "host" is either a plain or SSL-encrypted TCP/IP socket,
# SSL-encrypted TCP/IP socket, and "hostnossl" is a plain TCP/IP socket. # "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a
# plain TCP/IP socket.
# #
# DATABASE can be "all", "sameuser", "samerole", "replication", # DATABASE can be "all", "sameuser", "samerole", "replication", a
# a database name, or a comma-separated list thereof. # database name, or a comma-separated list thereof.
# #
# USER can be "all", a user name, a group name prefixed with "+", or # USER can be "all", a user name, a group name prefixed with "+", or a
# a comma-separated list thereof. In both the DATABASE and USER fields # comma-separated list thereof. In both the DATABASE and USER fields
# you can also write a file name prefixed with "@" to include names from # you can also write a file name prefixed with "@" to include names
# a separate file. # from a separate file.
# #
# CIDR-ADDRESS specifies the set of hosts the record matches. # CIDR-ADDRESS specifies the set of hosts the record matches. It is
# It is made up of an IP address and a CIDR mask that is an integer # made up of an IP address and a CIDR mask that is an integer (between
# (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that specifies # 0 and 32 (IPv4) or 128 (IPv6) inclusive) that specifies the number
# the number of significant bits in the mask. Alternatively, you can write # of significant bits in the mask. Alternatively, you can write an IP
# an IP address and netmask in separate columns to specify the set of hosts. # address and netmask in separate columns to specify the set of hosts.
# Instead of a CIDR-address, you can write "samehost" to match any of the # Instead of a CIDR-address, you can write "samehost" to match any of
# server's own IP addresses, or "samenet" to match any address in any subnet # the server's own IP addresses, or "samenet" to match any address in
# that the server is directly connected to. # any subnet that the server is directly connected to.
# #
# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi", "krb5", # METHOD can be "trust", "reject", "md5", "password", "gss", "sspi",
# "ident", "pam", "ldap" or "cert". Note that "password" sends passwords # "krb5", "ident", "pam", "ldap" or "cert". Note that "password"
# in clear text; "md5" is preferred since it sends encrypted passwords. # sends passwords in clear text; "md5" is preferred since it sends
# encrypted passwords.
# #
# OPTIONS are a set of options for the authentication in the format # OPTIONS are a set of options for the authentication in the format
# NAME=VALUE. The available options depend on the different authentication # NAME=VALUE. The available options depend on the different
# methods - refer to the "Client Authentication" section in the documentation # authentication methods -- refer to the "Client Authentication"
# for a list of which options are available for which authentication methods. # section in the documentation for a list of which options are
# available for which authentication methods.
# #
# Database and user names containing spaces, commas, quotes and other special # Database and user names containing spaces, commas, quotes and other
# characters must be quoted. Quoting one of the keywords "all", "sameuser", # special characters must be quoted. Quoting one of the keywords
# "samerole" or "replication" makes the name lose its special character, # "all", "sameuser", "samerole" or "replication" makes the name lose
# and just match a database or username with that name. # its special character, and just match a database or username with
# that name.
# #
# This file is read on server startup and when the postmaster receives # This file is read on server startup and when the postmaster receives
# a SIGHUP signal. If you edit the file on a running system, you have # a SIGHUP signal. If you edit the file on a running system, you have
# to SIGHUP the postmaster for the changes to take effect. You can use # to SIGHUP the postmaster for the changes to take effect. You can
# "pg_ctl reload" to do that. # use "pg_ctl reload" to do that.
# Put your actual configuration here # Put your actual configuration here
# ---------------------------------- # ----------------------------------
# #
# If you want to allow non-local connections, you need to add more # If you want to allow non-local connections, you need to add more
# "host" records. In that case you will also need to make PostgreSQL listen # "host" records. In that case you will also need to make PostgreSQL
# on a non-local interface via the listen_addresses configuration parameter, # listen on a non-local interface via the listen_addresses
# or via the -i or -h command line switches. # configuration parameter, or via the -i or -h command line switches.
#
@authcomment@ @authcomment@

28
src/backend/libpq/pg_ident.conf.sample
View File

@ -1,12 +1,13 @@
# PostgreSQL User Name Maps # PostgreSQL User Name Maps
# ========================= # =========================
# #
# Refer to the PostgreSQL Administrator's Guide, chapter "Client # Refer to the PostgreSQL documentation, chapter "Client
# Authentication" for a complete description. A short synopsis follows. # Authentication" for a complete description. A short synopsis
# follows.
# #
# This file controls PostgreSQL username mapping. It maps # This file controls PostgreSQL user name mapping. It maps external
# external user names to their corresponding # user names to their corresponding PostgreSQL user names. Records
# PostgreSQL user names. Records are of the form: # are of the form:
# #
# MAPNAME SYSTEM-USERNAME PG-USERNAME # MAPNAME SYSTEM-USERNAME PG-USERNAME
# #
@ -18,21 +19,22 @@
# existence of a record specifies that SYSTEM-USERNAME may connect as # existence of a record specifies that SYSTEM-USERNAME may connect as
# PG-USERNAME. # PG-USERNAME.
# #
# If SYSTEM-USERNAME starts with a slash (/), it will be treated as # If SYSTEM-USERNAME starts with a slash (/), it will be treated as a
# a regular expression. Optionally this can contain a capture (a # regular expression. Optionally this can contain a capture (a
# parenthesized subexpression). The substring matching the capture # parenthesized subexpression). The substring matching the capture
# will be substituted for \1 (backslash-one) if present in PG-USERNAME. # will be substituted for \1 (backslash-one) if present in
# PG-USERNAME.
# #
# Multiple maps may be specified in this file and used by pg_hba.conf. # Multiple maps may be specified in this file and used by pg_hba.conf.
# #
# No map names are defined in the default configuration. If all system # No map names are defined in the default configuration. If all
# user names and PostgreSQL user names are the same, you don't need # system user names and PostgreSQL user names are the same, you don't
# anything in this file. # need anything in this file.
# #
# This file is read on server startup and when the postmaster receives # This file is read on server startup and when the postmaster receives
# a SIGHUP signal. If you edit the file on a running system, you have # a SIGHUP signal. If you edit the file on a running system, you have
# to SIGHUP the postmaster for the changes to take effect. You can use # to SIGHUP the postmaster for the changes to take effect. You can
# "pg_ctl reload" to do that. # use "pg_ctl reload" to do that.
# Put your actual configuration here # Put your actual configuration here
# ---------------------------------- # ----------------------------------

10
src/bin/initdb/initdb.c
View File

@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.182 2010/01/06 23:23:51 momjian Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.183 2010/01/26 06:58:39 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -120,10 +120,10 @@ static int n_buffers = 50;
* Warning messages for authentication methods * Warning messages for authentication methods
*/ */
#define AUTHTRUST_WARNING \ #define AUTHTRUST_WARNING \
"# CAUTION: Configuring the system for local \"trust\" authentication allows\n" \ "# CAUTION: Configuring the system for local \"trust\" authentication\n" \
"# any local user to connect as any PostgreSQL user, including the database\n" \ "# allows any local user to connect as any PostgreSQL user, including\n" \
"# superuser. If you do not trust all your local users, use another\n" \ "# the database superuser. If you do not trust all your local users,\n" \
"# authentication method.\n" "# use another authentication method.\n"
static char *authwarning = NULL; static char *authwarning = NULL;
/* /*