Commit 6fcaaf29 authored by Tom Lane's avatar Tom Lane

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).
parent e22443f4
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.345 2005/08/14 22:19:49 petere Exp $ $PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.346 2005/08/21 03:39:26 tgl Exp $
--> -->
<chapter Id="runtime"> <chapter Id="runtime">
...@@ -1027,20 +1027,6 @@ SET ENABLE_SEQSCAN TO OFF; ...@@ -1027,20 +1027,6 @@ SET ENABLE_SEQSCAN TO OFF;
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry id="guc-krb-caseins-users" xreflabel="krb_caseins_users">
<term><varname>krb_caseins_users</varname> (<type>boolean</type>)</term>
<indexterm>
<primary><varname>krb_caseins_users</varname> configuration parameter</primary>
</indexterm>
<listitem>
<para>
Sets if Kerberos usernames should be treated case-insensitive.
The default is <literal>off</> (case sensitive). This parameter
can only be set at server start.
</para>
</listitem>
</varlistentry>
<varlistentry id="guc-krb-server-hostname" xreflabel="krb_server_hostname"> <varlistentry id="guc-krb-server-hostname" xreflabel="krb_server_hostname">
<term><varname>krb_server_hostname</varname> (<type>string</type>)</term> <term><varname>krb_server_hostname</varname> (<type>string</type>)</term>
<indexterm> <indexterm>
...@@ -1061,6 +1047,20 @@ SET ENABLE_SEQSCAN TO OFF; ...@@ -1061,6 +1047,20 @@ SET ENABLE_SEQSCAN TO OFF;
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry id="guc-krb-caseins-users" xreflabel="krb_caseins_users">
<term><varname>krb_caseins_users</varname> (<type>boolean</type>)</term>
<indexterm>
<primary><varname>krb_caseins_users</varname> configuration parameter</primary>
</indexterm>
<listitem>
<para>
Sets if Kerberos usernames should be treated case-insensitively.
The default is <literal>off</> (case sensitive). This parameter
can only be set at server start.
</para>
</listitem>
</varlistentry>
<varlistentry id="guc-db-user-namespace" xreflabel="db_user_namespace"> <varlistentry id="guc-db-user-namespace" xreflabel="db_user_namespace">
<term><varname>db_user_namespace</varname> (<type>boolean</type>)</term> <term><varname>db_user_namespace</varname> (<type>boolean</type>)</term>
<indexterm> <indexterm>
...@@ -1068,13 +1068,13 @@ SET ENABLE_SEQSCAN TO OFF; ...@@ -1068,13 +1068,13 @@ SET ENABLE_SEQSCAN TO OFF;
</indexterm> </indexterm>
<listitem> <listitem>
<para> <para>
This allows per-database user names. It is off by default. This enables per-database user names. It is off by default.
</para> </para>
<para> <para>
If this is on, you should create users as <literal>username@dbname</>. If this is on, you should create users as <literal>username@dbname</>.
When <literal>username</> is passed by a connecting client, When <literal>username</> is passed by a connecting client,
<literal>@</> and the database name is appended to the user <literal>@</> and the database name are appended to the user
name and that database-specific user name is looked up by the name and that database-specific user name is looked up by the
server. Note that when you create users with names containing server. Note that when you create users with names containing
<literal>@</> within the SQL environment, you will need to <literal>@</> within the SQL environment, you will need to
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * 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[] = ...@@ -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."), gettext_noop("Sets the list of known custom variable classes."),
NULL, NULL,
GUC_LIST_INPUT | GUC_LIST_QUOTE GUC_LIST_INPUT | GUC_LIST_QUOTE
......
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
# The default values of these variables are driven from the -D command line # The default values of these variables are driven from the -D command line
# switch or PGDATA environment variable, represented here as ConfigDir. # switch or PGDATA environment variable, represented here as ConfigDir.
# data_directory = 'ConfigDir' # use data in another directory #data_directory = 'ConfigDir' # use data in another directory
# hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file #hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file
# ident_file = 'ConfigDir/pg_ident.conf # IDENT configuration file #ident_file = 'ConfigDir/pg_ident.conf # IDENT configuration file
# If external_pid_file is not explicitly set, no extra pid file is written. # 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 @@ ...@@ -66,10 +66,12 @@
#ssl = off #ssl = off
#password_encryption = on #password_encryption = on
#db_user_namespace = off #db_user_namespace = off
# Kerberos # Kerberos
#krb_server_keyfile = '' #krb_server_keyfile = ''
#krb_caseins_users = off
#krb_srvname = 'postgres' #krb_srvname = 'postgres'
#krb_server_hostname = '(any)' # if not set, matches any keytab entry
#krb_caseins_users = off
# - TCP Keepalives - # - TCP Keepalives -
# see 'man 7 tcp' for details # see 'man 7 tcp' for details
...@@ -413,3 +415,10 @@ ...@@ -413,3 +415,10 @@
# - Other Platforms & Clients - # - Other Platforms & Clients -
#transform_null_equals = off #transform_null_equals = off
#---------------------------------------------------------------------------
# CUSTOMIZED OPTIONS
#---------------------------------------------------------------------------
#custom_variable_classes = '' # list of custom variable class names
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment