diff options
| author | Bruce Momjian <bruce@momjian.us> | 2023-05-20 21:32:54 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2023-05-20 21:32:54 -0400 |
| commit | 9c0a0e2ed92a1a94ec30d36f8ea1ab12c928292b (patch) | |
| tree | f1eadcecb542a98733da2ed16ce311248686ba1e /src/backend/utils | |
| parent | cf109ffc205063f82258e0643588491a153c3a45 (diff) | |
| download | postgresql-9c0a0e2ed92a1a94ec30d36f8ea1ab12c928292b.tar.gz postgresql-9c0a0e2ed92a1a94ec30d36f8ea1ab12c928292b.zip | |
rename "gss_accept_deleg" to "gss_accept_delegation".
This is more consistent with existing GUC spelling.
Discussion: https://postgr.es/m/ZGdnEsGtNj7+fZoa@momjian.us
Diffstat (limited to 'src/backend/utils')
| -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 |
4 files changed, 6 insertions, 6 deletions
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 }, |