Copy pg_ident.conf.sample into /lib directory. Rename USERAUTH to

bmomjian · bmomjian · commit 2f52eee2d18b · 2000-05-30T16:36:15.000Z
AUTHTYPE in config file.  Patch both branches.
diff --git a/src/backend/Makefile b/src/backend/Makefile
@@ -34,7 +34,7 @@
 #
 #
 # 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) \
          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
@@ -217,6 +218,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
@@ -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     
  

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`#`
`38`	`38`	`# Format:`
`39`	`39`	`#`
`40`		`-# host DBNAME IP_ADDRESS ADDRESS_MASK USERAUTH [AUTH_ARGUMENT]`
	`40`	`+# host DBNAME IP_ADDRESS ADDRESS_MASK AUTHTYPE [AUTH_ARGUMENT]`
`41`	`41`	`#`
`42`	`42`	`# DBNAME is the name of a PostgreSQL database, "all" to indicate all`
`43`	`43`	`# databases, or "sameuser" to restrict a user's access to a database`
`@@ -47,7 +47,7 @@`
`47`	`47`	`# mask to identify a set of hosts. These hosts are allowed to connect to`
`48`	`48`	`# Database DBNAME.`
`49`	`49`	`#`
`50`		`-# USERAUTH is a keyword indicating the method used to authenticate the`
	`50`	`+# AUTHTYPE is a keyword indicating the method used to authenticate the`
`51`	`51`	`# user, i.e. to determine that the principal is authorized to connect`
`52`	`52`	`# under the PostgreSQL username he supplies in his connection parameters.`
`53`	`53`	`#`
`@@ -99,18 +99,18 @@`
`99`	`99`	`#`
`100`	`100`	`# Format:`
`101`	`101`	`#`
`102`		`-# local DBNAME USERAUTH [AUTH_ARGUMENT]`
	`102`	`+# local DBNAME AUTHTYPE [AUTH_ARGUMENT]`
`103`	`103`	`#`
`104`	`104`	`# The format is the same as that of the "host" record type except that the`
`105`	`105`	`# IP_ADDRESS and ADDRESS_MASK are omitted and the "ident", "krb4" and "krb5"`
`106`		`-# values of USERAUTH are not allowed.`
	`106`	`+# values of AUTHTYPE are not allowed.`
`107`	`107`
`108`	`108`	`# For backwards compatibility, PostgreSQL also accepts pre-version 6 records,`
`109`	`109`	`# which look like:`
`110`	`110`	`#`
`111`	`111`	`# all 127.0.0.1 0.0.0.0`
`112`	`112`
`113`		`-# TYPE DATABASE IP_ADDRESS MASK USERAUTH MAP`
	`113`	`+# TYPE DATABASE IP_ADDRESS MASK AUTHTYPE MAP`
`114`	`114`
`115`	`115`	`#host all 127.0.0.1 255.255.255.255 trust`
`116`	`116`