Minor GUC cleanups: document krb_server_hostname and custom_variable_classes

in postgresql.conf.sample, mark custom_variable_classes as SIGHUP not
POSTMASTER to agree with the documentation (I can't see a reason it has
to be POSTMASTER so I think the docs are right).

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index efb46060d966491f548fcfe6a8255bbd955a7220..0966b5105e52b07862d6c1be669cfcfbc51a86f5 100644 (file)
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -1027,20 +1027,6 @@ SET ENABLE_SEQSCAN TO OFF;
       
      
 
-     
-      krb_caseins_users (boolean)
-      
-       krb_caseins_users configuration parameter
-      
-      
-       
-        Sets if Kerberos usernames should be treated case-insensitive.
-        The default is off (case sensitive). This parameter
-        can only be set at server start.
-       
-      
-     
-
      
       krb_server_hostname (string)
       
@@ -1061,6 +1047,20 @@ SET ENABLE_SEQSCAN TO OFF;
       
      
 
+     
+      krb_caseins_users (boolean)
+      
+       krb_caseins_users configuration parameter
+      
+      
+       
+        Sets if Kerberos usernames should be treated case-insensitively.
+        The default is off (case sensitive). This parameter
+        can only be set at server start.
+       
+      
+     
+
      
       db_user_namespace (boolean)
       
@@ -1068,13 +1068,13 @@ SET ENABLE_SEQSCAN TO OFF;
       
       
        
-        This allows per-database user names.  It is off by default.
+        This enables per-database user names.  It is off by default.
        
 
        
         If this is on, you should create users as username@dbname.
         When username is passed by a connecting client,
-        @ and the database name is appended to the user
+        @ and the database name are appended to the user
         name and that database-specific user name is looked up by the
         server. Note that when you create users with names containing
         @ within the SQL environment, you will need to

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index d51f8837eeec5eb512fabf68a716e1c46d3c7fc6..6fd3d9fc5c4159ae3a1237efd56c834efb7e8b69 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut .
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.284 2005/08/20 23:26:26 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.285 2005/08/21 03:39:34 tgl Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -2029,7 +2029,7 @@ static struct config_string ConfigureNamesString[] =
    },
 
    {
-       {"custom_variable_classes", PGC_POSTMASTER, RESOURCES_KERNEL,
+       {"custom_variable_classes", PGC_SIGHUP, CUSTOM_OPTIONS,
            gettext_noop("Sets the list of known custom variable classes."),
            NULL,
            GUC_LIST_INPUT | GUC_LIST_QUOTE

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 6e08b4cc32acfcba49b47ae37540b97cf9daa2b9..48152e8ed265070022960f6462eeb9b3940622f3 100644 (file)
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -32,12 +32,12 @@
 # The default values of these variables are driven from the -D command line
 # switch or PGDATA environment variable, represented here as ConfigDir.
 
-# data_directory = 'ConfigDir'     # use data in another directory
-# hba_file = 'ConfigDir/pg_hba.conf'   # host-based authentication file
-# ident_file = 'ConfigDir/pg_ident.conf    # IDENT configuration file
+#data_directory = 'ConfigDir'      # use data in another directory
+#hba_file = 'ConfigDir/pg_hba.conf'    # host-based authentication file
+#ident_file = 'ConfigDir/pg_ident.conf # IDENT configuration file
 
 # If external_pid_file is not explicitly set, no extra pid file is written.
-# external_pid_file = '(none)'     # write an extra pid file
+#external_pid_file = '(none)'      # write an extra pid file
 
 
 #---------------------------------------------------------------------------
@@ -66,10 +66,12 @@
 #ssl = off
 #password_encryption = on
 #db_user_namespace = off
+
 # Kerberos
 #krb_server_keyfile = ''
-#krb_caseins_users = off
 #krb_srvname = 'postgres'
+#krb_server_hostname = '(any)'     # if not set, matches any keytab entry
+#krb_caseins_users = off
 
 # - TCP Keepalives -
 # see 'man 7 tcp' for details
@@ -413,3 +415,10 @@
 # - Other Platforms & Clients -
 
 #transform_null_equals = off
+
+
+#---------------------------------------------------------------------------
+# CUSTOMIZED OPTIONS
+#---------------------------------------------------------------------------
+
+#custom_variable_classes = ''      # list of custom variable class names