Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6fcaaf2

Browse files
committed
Minor GUC cleanups: document krb_server_hostname and custom_variable_classes
in postgresql.conf.sample, mark custom_variable_classes as SIGHUP notPOSTMASTER to agree with the documentation (I can't see a reason it hasto be POSTMASTER so I think the docs are right).
1 parente22443f commit6fcaaf2

File tree

3 files changed

+33
-24
lines changed

3 files changed

+33
-24
lines changed

‎doc/src/sgml/runtime.sgml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.345 2005/08/14 22:19:49 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.346 2005/08/21 03:39:26 tgl Exp $
33
-->
44

55
<chapter Id="runtime">
@@ -1027,20 +1027,6 @@ SET ENABLE_SEQSCAN TO OFF;
10271027
</listitem>
10281028
</varlistentry>
10291029

1030-
<varlistentry id="guc-krb-caseins-users" xreflabel="krb_caseins_users">
1031-
<term><varname>krb_caseins_users</varname> (<type>boolean</type>)</term>
1032-
<indexterm>
1033-
<primary><varname>krb_caseins_users</varname> configuration parameter</primary>
1034-
</indexterm>
1035-
<listitem>
1036-
<para>
1037-
Sets if Kerberos usernames should be treated case-insensitive.
1038-
The default is <literal>off</> (case sensitive). This parameter
1039-
can only be set at server start.
1040-
</para>
1041-
</listitem>
1042-
</varlistentry>
1043-
10441030
<varlistentry id="guc-krb-server-hostname" xreflabel="krb_server_hostname">
10451031
<term><varname>krb_server_hostname</varname> (<type>string</type>)</term>
10461032
<indexterm>
@@ -1061,20 +1047,34 @@ SET ENABLE_SEQSCAN TO OFF;
10611047
</listitem>
10621048
</varlistentry>
10631049

1050+
<varlistentry id="guc-krb-caseins-users" xreflabel="krb_caseins_users">
1051+
<term><varname>krb_caseins_users</varname> (<type>boolean</type>)</term>
1052+
<indexterm>
1053+
<primary><varname>krb_caseins_users</varname> configuration parameter</primary>
1054+
</indexterm>
1055+
<listitem>
1056+
<para>
1057+
Sets if Kerberos usernames should be treated case-insensitively.
1058+
The default is <literal>off</> (case sensitive). This parameter
1059+
can only be set at server start.
1060+
</para>
1061+
</listitem>
1062+
</varlistentry>
1063+
10641064
<varlistentry id="guc-db-user-namespace" xreflabel="db_user_namespace">
10651065
<term><varname>db_user_namespace</varname> (<type>boolean</type>)</term>
10661066
<indexterm>
10671067
<primary><varname>db_user_namespace</> configuration parameter</primary>
10681068
</indexterm>
10691069
<listitem>
10701070
<para>
1071-
Thisallows per-database user names. It is off by default.
1071+
Thisenables per-database user names. It is off by default.
10721072
</para>
10731073

10741074
<para>
10751075
If this is on, you should create users as <literal>username@dbname</>.
10761076
When <literal>username</> is passed by a connecting client,
1077-
<literal>@</> and the database nameis appended to the user
1077+
<literal>@</> and the database nameare appended to the user
10781078
name and that database-specific user name is looked up by the
10791079
server. Note that when you create users with names containing
10801080
<literal>@</> within the SQL environment, you will need to

‎src/backend/utils/misc/guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.284 2005/08/20 23:26:26 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.285 2005/08/21 03:39:34 tgl Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -2029,7 +2029,7 @@ static struct config_string ConfigureNamesString[] =
20292029
},
20302030

20312031
{
2032-
{"custom_variable_classes",PGC_POSTMASTER,RESOURCES_KERNEL,
2032+
{"custom_variable_classes",PGC_SIGHUP,CUSTOM_OPTIONS,
20332033
gettext_noop("Sets the list of known custom variable classes."),
20342034
NULL,
20352035
GUC_LIST_INPUT |GUC_LIST_QUOTE

‎src/backend/utils/misc/postgresql.conf.sample

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
# The default values of these variables are driven from the -D command line
3333
# switch or PGDATA environment variable, represented here as ConfigDir.
3434

35-
#data_directory = 'ConfigDir'# use data in another directory
36-
#hba_file = 'ConfigDir/pg_hba.conf'# host-based authentication file
37-
#ident_file = 'ConfigDir/pg_ident.conf# IDENT configuration file
35+
#data_directory = 'ConfigDir'# use data in another directory
36+
#hba_file = 'ConfigDir/pg_hba.conf'# host-based authentication file
37+
#ident_file = 'ConfigDir/pg_ident.conf# IDENT configuration file
3838

3939
# If external_pid_file is not explicitly set, no extra pid file is written.
40-
#external_pid_file = '(none)'# write an extra pid file
40+
#external_pid_file = '(none)'# write an extra pid file
4141

4242

4343
#---------------------------------------------------------------------------
@@ -66,10 +66,12 @@
6666
#ssl = off
6767
#password_encryption = on
6868
#db_user_namespace = off
69+
6970
# Kerberos
7071
#krb_server_keyfile = ''
71-
#krb_caseins_users = off
7272
#krb_srvname = 'postgres'
73+
#krb_server_hostname = '(any)'# if not set, matches any keytab entry
74+
#krb_caseins_users = off
7375

7476
# - TCP Keepalives -
7577
# see 'man 7 tcp' for details
@@ -413,3 +415,10 @@
413415
# - Other Platforms & Clients -
414416

415417
#transform_null_equals = off
418+
419+
420+
#---------------------------------------------------------------------------
421+
# CUSTOMIZED OPTIONS
422+
#---------------------------------------------------------------------------
423+
424+
#custom_variable_classes = ''# list of custom variable class names

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp