diff options
| author | Magnus Hagander <magnus@hagander.net> | 2009-01-09 10:13:19 +0000 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2009-01-09 10:13:19 +0000 |
| commit | 1b4e729eaa97b6169e08abc70e84709cea2cd00a (patch) | |
| tree | 4daae665450a6f2f7b3fc618abf9042917391640 /src/backend/utils | |
| parent | 32e1265dd97e8321ad67418b781f3d0cf8a9282c (diff) | |
Make krb_realm and krb_server_hostname be pg_hba options only, and remove
their GUCs.
In passing, noted that the pg_hba options for krb5 authentication weren't
listed at all - so add this.
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 21 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 3 |
2 files changed, 1 insertions, 23 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 22cfbff6105..8d927ae1387 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.491 2009/01/07 22:40:49 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.492 2009/01/09 10:13:18 mha Exp $ * *-------------------------------------------------------------------- */ @@ -2131,16 +2131,6 @@ static struct config_string ConfigureNamesString[] = }, { - {"krb_realm", PGC_SIGHUP, CONN_AUTH_SECURITY, - gettext_noop("Sets realm to match Kerberos and GSSAPI users against."), - NULL, - GUC_SUPERUSER_ONLY - }, - &pg_krb_realm, - NULL, NULL, NULL - }, - - { {"krb_server_keyfile", PGC_SIGHUP, CONN_AUTH_SECURITY, gettext_noop("Sets the location of the Kerberos server key file."), NULL, @@ -2160,15 +2150,6 @@ static struct config_string ConfigureNamesString[] = }, { - {"krb_server_hostname", PGC_SIGHUP, CONN_AUTH_SECURITY, - gettext_noop("Sets the hostname of the Kerberos server."), - NULL - }, - &pg_krb_server_hostname, - NULL, NULL, NULL - }, - - { {"bonjour_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS, gettext_noop("Sets the Bonjour broadcast service name."), NULL diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index d53861511ae..ffa5055b768 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -81,10 +81,7 @@ # Kerberos and GSSAPI #krb_server_keyfile = '' #krb_srvname = 'postgres' # (Kerberos only) -#krb_server_hostname = '' # empty string matches any keytab entry - # (Kerberos only) #krb_caseins_users = off -#krb_realm = '' # - TCP Keepalives - # see "man 7 tcp" for details |