diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/auth.c | 1 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 13 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 3 | ||||
| -rw-r--r-- | src/include/libpq/auth.h | 2 | ||||
| -rw-r--r-- | src/include/libpq/hba.h | 1 |
5 files changed, 1 insertions, 19 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index f03aa7edc22..2a46f7b9130 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -129,7 +129,6 @@ static int CheckCertAuth(Port *port); *---------------------------------------------------------------- */ char *pg_krb_server_keyfile; -char *pg_krb_srvnam; bool pg_krb_caseins_users; 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 - diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index 5ae8114e8b9..ace647a7ff1 100644 --- a/src/include/libpq/auth.h +++ b/src/include/libpq/auth.h @@ -17,9 +17,7 @@ #include "libpq/libpq-be.h" extern char *pg_krb_server_keyfile; -extern char *pg_krb_srvnam; extern bool pg_krb_caseins_users; -extern char *pg_krb_server_hostname; extern char *pg_krb_realm; extern void ClientAuthentication(Port *port); diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index 5a103aed195..68a953aa628 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -75,7 +75,6 @@ typedef struct HbaLine char *ldapprefix; char *ldapsuffix; bool clientcert; - char *krb_server_hostname; char *krb_realm; bool include_realm; char *radiusserver; |