diff options
| author | Bruce Momjian | 2000-05-30 16:36:34 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2000-05-30 16:36:34 +0000 |
| commit | 27266b707182dee218aebd934cf0590516f330a2 (patch) | |
| tree | 69790fa9587695f3cfd20f92b7a1396d94dec661 | |
| parent | 4fd3e0dde941ec223efe32579ccfc7e74323e0c4 (diff) | |
Copy pg_ident.conf.sample into /lib directory. Rename USERAUTH to
AUTHTYPE in config file. Patch both branches.
| -rw-r--r-- | src/backend/Makefile | 7 | ||||
| -rw-r--r-- | src/backend/libpq/pg_hba.conf.sample | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index ae90a17b042..27ce2867e40 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -34,7 +34,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.47 2000/05/11 17:46:28 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.47.2.1 2000/05/30 16:36:34 momjian Exp $ # #------------------------------------------------------------------------- @@ -188,7 +188,8 @@ endif install-templates: $(TEMPLATEDIR) \ global1.bki.source local1_template1.bki.source \ 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 $(INSTALL) $(INSTLOPTS) global1.bki.source \ $(TEMPLATEDIR)/global1.bki.source @@ -200,6 +201,8 @@ install-templates: $(TEMPLATEDIR) \ $(TEMPLATEDIR)/local1_template1.description $(INSTALL) $(INSTLOPTS) libpq/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 \ $(TEMPLATEDIR)/pg_geqo.sample $(INSTALL) $(INSTLOPTS) pg_options.sample \ diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample index 1152a3c6cfb..047a63a217a 100644 --- a/src/backend/libpq/pg_hba.conf.sample +++ b/src/backend/libpq/pg_hba.conf.sample @@ -37,7 +37,7 @@ # # 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 # 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 # 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 # under the PostgreSQL username he supplies in his connection parameters. # @@ -99,18 +99,18 @@ # # 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 # 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, # which look like: # # 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 |