diff options
| author | Magnus Hagander | 2014-03-16 14:18:52 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2014-03-16 14:22:45 +0000 |
| commit | 0294023a6b1c5df7683707a77238ab634d4ea8c1 (patch) | |
| tree | fc0f99b36e9577c1ba7aa873246d46b4a58a1b47 /src/backend/utils | |
| parent | e3c9f23250fc445568b2aefab8bcdc25371cff5b (diff) | |
Cleanups from the remove-native-krb5 patch
krb_srvname is actually not available anymore as a parameter server-side, since
with gssapi we accept all principals in our keytab. It's still used in libpq for
client side specification.
In passing remove declaration of krb_server_hostname, where all the functionality
was already removed.
Noted by Stephen Frost, though a different solution than his suggestion
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 13 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 3 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index c76edb48a9b..7d7d1dc263f 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -85,9 +85,6 @@ #ifndef PG_KRB_SRVTAB #define PG_KRB_SRVTAB "" #endif -#ifndef PG_KRB_SRVNAM -#define PG_KRB_SRVNAM "" -#endif #define CONFIG_FILENAME "postgresql.conf" #define HBA_FILENAME "pg_hba.conf" @@ -2803,16 +2800,6 @@ static struct config_string ConfigureNamesString[] = }, { - {"krb_srvname", PGC_SIGHUP, CONN_AUTH_SECURITY, - gettext_noop("Sets the name of the Kerberos service."), - NULL - }, - &pg_krb_srvnam, - PG_KRB_SRVNAM, - NULL, NULL, NULL - }, - - { {"bonjour_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS, gettext_noop("Sets the Bonjour service name."), NULL diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 3629a52c9fe..70e5a5111ec 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -91,9 +91,8 @@ #password_encryption = on #db_user_namespace = off -# Kerberos and GSSAPI +# GSSAPI using Kerberos #krb_server_keyfile = '' -#krb_srvname = 'postgres' # (Kerberos only) #krb_caseins_users = off # - TCP Keepalives - |