diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-08-21 03:39:37 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-08-21 03:39:37 +0000 |
| commit | 6fcaaf29dad233ceca67f31115dc75342a433e79 (patch) | |
| tree | 6c390902651acec44bcf86592a2625b613f25ac0 /src | |
| parent | e22443f405e26020c85e68853f0ce137d2711146 (diff) | |
| download | postgresql-6fcaaf29dad233ceca67f31115dc75342a433e79.tar.gz postgresql-6fcaaf29dad233ceca67f31115dc75342a433e79.zip | |
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).
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 19 |
2 files changed, 16 insertions, 7 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index d51f8837eee..6fd3d9fc5c4 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * 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 6e08b4cc32a..48152e8ed26 100644 --- 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 |