diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/auth.c | 4 | ||||
| -rw-r--r-- | src/backend/libpq/be-secure-gssapi.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/activity/backend_status.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/pgstatfuncs.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/init/postinit.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc_tables.c | 4 | ||||
| -rw-r--r-- | src/include/libpq/auth.h | 2 | ||||
| -rw-r--r-- | src/include/libpq/libpq-be.h | 2 | ||||
| -rw-r--r-- | src/include/utils/backend_status.h | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index a1a826e37fd..a98b934a8e2 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -165,7 +165,7 @@ static int CheckCertAuth(Port *port); */ char *pg_krb_server_keyfile; bool pg_krb_caseins_users; -bool pg_gss_accept_deleg; +bool pg_gss_accept_delegation; /*---------------------------------------------------------------- @@ -1003,7 +1003,7 @@ pg_GSS_recvauth(Port *port) &port->gss->outbuf, &gflags, NULL, - pg_gss_accept_deleg ? &delegated_creds : NULL); + pg_gss_accept_delegation ? &delegated_creds : NULL); /* gbuf no longer used */ pfree(buf.data); diff --git a/src/backend/libpq/be-secure-gssapi.c b/src/backend/libpq/be-secure-gssapi.c index 43d45810cd1..cda9376d5a2 100644 --- a/src/backend/libpq/be-secure-gssapi.c +++ b/src/backend/libpq/be-secure-gssapi.c @@ -593,7 +593,7 @@ secure_open_gssapi(Port *port) GSS_C_NO_CREDENTIAL, &input, GSS_C_NO_CHANNEL_BINDINGS, &port->gss->name, NULL, &output, NULL, - NULL, pg_gss_accept_deleg ? &delegated_creds : NULL); + NULL, pg_gss_accept_delegation ? &delegated_creds : NULL); if (GSS_ERROR(major)) { @@ -749,7 +749,7 @@ be_gssapi_get_princ(Port *port) * connection. */ bool -be_gssapi_get_deleg(Port *port) +be_gssapi_get_delegation(Port *port) { if (!port || !port->gss) return false; diff --git a/src/backend/utils/activity/backend_status.c b/src/backend/utils/activity/backend_status.c index a8f927f5407..38f91a495b8 100644 --- a/src/backend/utils/activity/backend_status.c +++ b/src/backend/utils/activity/backend_status.c @@ -384,7 +384,7 @@ pgstat_bestart(void) lbeentry.st_gss = true; lgssstatus.gss_auth = be_gssapi_get_auth(MyProcPort); lgssstatus.gss_enc = be_gssapi_get_enc(MyProcPort); - lgssstatus.gss_deleg = be_gssapi_get_deleg(MyProcPort); + lgssstatus.gss_delegation = be_gssapi_get_delegation(MyProcPort); if (princ) strlcpy(lgssstatus.gss_princ, princ, NAMEDATALEN); } diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 70da0a2de15..49adc319fc8 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -600,7 +600,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS) values[25] = BoolGetDatum(beentry->st_gssstatus->gss_auth); /* gss_auth */ values[26] = CStringGetTextDatum(beentry->st_gssstatus->gss_princ); values[27] = BoolGetDatum(beentry->st_gssstatus->gss_enc); /* GSS Encryption in use */ - values[28] = BoolGetDatum(beentry->st_gssstatus->gss_deleg); /* GSS credentials + values[28] = BoolGetDatum(beentry->st_gssstatus->gss_delegation); /* GSS credentials * delegated */ } else diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 88434c3e5d4..3359b34f527 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -285,14 +285,14 @@ PerformAuthentication(Port *port) _(" GSS (authenticated=%s, encrypted=%s, deleg_credentials=%s, principal=%s)"), be_gssapi_get_auth(port) ? _("yes") : _("no"), be_gssapi_get_enc(port) ? _("yes") : _("no"), - be_gssapi_get_deleg(port) ? _("yes") : _("no"), + be_gssapi_get_delegation(port) ? _("yes") : _("no"), princ); else appendStringInfo(&logmsg, _(" GSS (authenticated=%s, encrypted=%s, deleg_credentials=%s)"), be_gssapi_get_auth(port) ? _("yes") : _("no"), be_gssapi_get_enc(port) ? _("yes") : _("no"), - be_gssapi_get_deleg(port) ? _("yes") : _("no")); + be_gssapi_get_delegation(port) ? _("yes") : _("no")); } #endif diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index c27eb367583..68aecad66f4 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -1728,11 +1728,11 @@ struct config_bool ConfigureNamesBool[] = }, { - {"gss_accept_deleg", PGC_SIGHUP, CONN_AUTH_AUTH, + {"gss_accept_delegation", PGC_SIGHUP, CONN_AUTH_AUTH, gettext_noop("Sets whether GSSAPI delegation should be accepted from the client."), NULL }, - &pg_gss_accept_deleg, + &pg_gss_accept_delegation, false, NULL, NULL, NULL }, diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index e4d0e38c1ee..3b3b2cc4aaa 100644 --- a/src/include/libpq/auth.h +++ b/src/include/libpq/auth.h @@ -18,7 +18,7 @@ extern PGDLLIMPORT char *pg_krb_server_keyfile; extern PGDLLIMPORT bool pg_krb_caseins_users; -extern PGDLLIMPORT bool pg_gss_accept_deleg; +extern PGDLLIMPORT bool pg_gss_accept_delegation; extern PGDLLIMPORT char *pg_krb_realm; extern void ClientAuthentication(Port *port); diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index e9df4295e20..3b2ce9908f8 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -329,7 +329,7 @@ extern PGDLLIMPORT openssl_tls_init_hook_typ openssl_tls_init_hook; extern bool be_gssapi_get_auth(Port *port); extern bool be_gssapi_get_enc(Port *port); extern const char *be_gssapi_get_princ(Port *port); -extern bool be_gssapi_get_deleg(Port *port); +extern bool be_gssapi_get_delegation(Port *port); /* Read and write to a GSSAPI-encrypted connection. */ extern ssize_t be_gssapi_read(Port *port, void *ptr, size_t len); diff --git a/src/include/utils/backend_status.h b/src/include/utils/backend_status.h index cfb26d2bcc9..16500d53b2a 100644 --- a/src/include/utils/backend_status.h +++ b/src/include/utils/backend_status.h @@ -77,7 +77,7 @@ typedef struct PgBackendGSSStatus char gss_princ[NAMEDATALEN]; /* GSSAPI Principal used to auth */ bool gss_auth; /* If GSSAPI authentication was used */ bool gss_enc; /* If encryption is being used */ - bool gss_deleg; /* If credentials delegated */ + bool gss_delegation; /* If credentials delegated */ } PgBackendGSSStatus; |