Copy pg_ident.conf.sample into /lib directory. Rename USERAUTH to
AUTHTYPE in config file. Patch both branches.
This commit is contained in:
parent
aea9b6e20f
commit
2f52eee2d1
|
@ -34,7 +34,7 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# IDENTIFICATION
|
# IDENTIFICATION
|
||||||
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.50 2000/05/29 20:51:35 tgl Exp $
|
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.51 2000/05/30 16:36:14 momjian Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -205,7 +205,8 @@ endif
|
||||||
install-templates: $(TEMPLATEDIR) \
|
install-templates: $(TEMPLATEDIR) \
|
||||||
global1.bki.source local1_template1.bki.source \
|
global1.bki.source local1_template1.bki.source \
|
||||||
global1.description local1_template1.description \
|
global1.description local1_template1.description \
|
||||||
libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample \
|
libpq/pg_hba.conf.sample libpq/pg_ident.conf.sample \
|
||||||
|
optimizer/geqo/pg_geqo.sample \
|
||||||
pg_options.sample
|
pg_options.sample
|
||||||
$(INSTALL) $(INSTLOPTS) global1.bki.source \
|
$(INSTALL) $(INSTLOPTS) global1.bki.source \
|
||||||
$(TEMPLATEDIR)/global1.bki.source
|
$(TEMPLATEDIR)/global1.bki.source
|
||||||
|
@ -217,6 +218,8 @@ install-templates: $(TEMPLATEDIR) \
|
||||||
$(TEMPLATEDIR)/local1_template1.description
|
$(TEMPLATEDIR)/local1_template1.description
|
||||||
$(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
|
$(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
|
||||||
$(TEMPLATEDIR)/pg_hba.conf.sample
|
$(TEMPLATEDIR)/pg_hba.conf.sample
|
||||||
|
$(INSTALL) $(INSTLOPTS) libpq/pg_ident.conf.sample \
|
||||||
|
$(TEMPLATEDIR)/pg_ident.conf.sample
|
||||||
$(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
|
$(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
|
||||||
$(TEMPLATEDIR)/pg_geqo.sample
|
$(TEMPLATEDIR)/pg_geqo.sample
|
||||||
$(INSTALL) $(INSTLOPTS) pg_options.sample \
|
$(INSTALL) $(INSTLOPTS) pg_options.sample \
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#
|
#
|
||||||
# Format:
|
# Format:
|
||||||
#
|
#
|
||||||
# host DBNAME IP_ADDRESS ADDRESS_MASK USERAUTH [AUTH_ARGUMENT]
|
# host DBNAME IP_ADDRESS ADDRESS_MASK AUTHTYPE [AUTH_ARGUMENT]
|
||||||
#
|
#
|
||||||
# DBNAME is the name of a PostgreSQL database, "all" to indicate all
|
# DBNAME is the name of a PostgreSQL database, "all" to indicate all
|
||||||
# databases, or "sameuser" to restrict a user's access to a database
|
# databases, or "sameuser" to restrict a user's access to a database
|
||||||
|
@ -47,7 +47,7 @@
|
||||||
# mask to identify a set of hosts. These hosts are allowed to connect to
|
# mask to identify a set of hosts. These hosts are allowed to connect to
|
||||||
# Database DBNAME.
|
# Database DBNAME.
|
||||||
#
|
#
|
||||||
# USERAUTH is a keyword indicating the method used to authenticate the
|
# AUTHTYPE is a keyword indicating the method used to authenticate the
|
||||||
# user, i.e. to determine that the principal is authorized to connect
|
# user, i.e. to determine that the principal is authorized to connect
|
||||||
# under the PostgreSQL username he supplies in his connection parameters.
|
# under the PostgreSQL username he supplies in his connection parameters.
|
||||||
#
|
#
|
||||||
|
@ -99,18 +99,18 @@
|
||||||
#
|
#
|
||||||
# Format:
|
# Format:
|
||||||
#
|
#
|
||||||
# local DBNAME USERAUTH [AUTH_ARGUMENT]
|
# local DBNAME AUTHTYPE [AUTH_ARGUMENT]
|
||||||
#
|
#
|
||||||
# The format is the same as that of the "host" record type except that the
|
# The format is the same as that of the "host" record type except that the
|
||||||
# IP_ADDRESS and ADDRESS_MASK are omitted and the "ident", "krb4" and "krb5"
|
# IP_ADDRESS and ADDRESS_MASK are omitted and the "ident", "krb4" and "krb5"
|
||||||
# values of USERAUTH are not allowed.
|
# values of AUTHTYPE are not allowed.
|
||||||
|
|
||||||
# For backwards compatibility, PostgreSQL also accepts pre-version 6 records,
|
# For backwards compatibility, PostgreSQL also accepts pre-version 6 records,
|
||||||
# which look like:
|
# which look like:
|
||||||
#
|
#
|
||||||
# all 127.0.0.1 0.0.0.0
|
# all 127.0.0.1 0.0.0.0
|
||||||
|
|
||||||
# TYPE DATABASE IP_ADDRESS MASK USERAUTH MAP
|
# TYPE DATABASE IP_ADDRESS MASK AUTHTYPE MAP
|
||||||
|
|
||||||
#host all 127.0.0.1 255.255.255.255 trust
|
#host all 127.0.0.1 255.255.255.255 trust
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue