Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9c0a0e2

Browse files
committed
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
1 parentcf109ff commit9c0a0e2

File tree

13 files changed

+21
-21
lines changed

13 files changed

+21
-21
lines changed

‎contrib/dblink/dblink.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2604,7 +2604,7 @@ dblink_security_check(PGconn *conn, remoteConn *rconn, const char *connstr)
26042604

26052605
#ifdefENABLE_GSS
26062606
/* If GSSAPI creds used to connect, make sure it was one delegated */
2607-
if (PQconnectionUsedGSSAPI(conn)&&be_gssapi_get_deleg(MyProcPort))
2607+
if (PQconnectionUsedGSSAPI(conn)&&be_gssapi_get_delegation(MyProcPort))
26082608
return;
26092609
#endif
26102610

@@ -2671,7 +2671,7 @@ dblink_connstr_check(const char *connstr)
26712671
return;
26722672

26732673
#ifdefENABLE_GSS
2674-
if (be_gssapi_get_deleg(MyProcPort))
2674+
if (be_gssapi_get_delegation(MyProcPort))
26752675
return;
26762676
#endif
26772677

‎contrib/postgres_fdw/connection.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ pgfdw_security_check(const char **keywords, const char **values, UserMapping *us
402402

403403
#ifdefENABLE_GSS
404404
/* Connected via GSSAPI with delegated credentials- all good. */
405-
if (PQconnectionUsedGSSAPI(conn)&&be_gssapi_get_deleg(MyProcPort))
405+
if (PQconnectionUsedGSSAPI(conn)&&be_gssapi_get_delegation(MyProcPort))
406406
return;
407407
#endif
408408

@@ -612,7 +612,7 @@ check_conn_params(const char **keywords, const char **values, UserMapping *user)
612612

613613
#ifdefENABLE_GSS
614614
/* ok if the user provided their own delegated credentials */
615-
if (be_gssapi_get_deleg(MyProcPort))
615+
if (be_gssapi_get_delegation(MyProcPort))
616616
return;
617617
#endif
618618

‎doc/src/sgml/config.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,10 +1190,10 @@ include_dir 'conf.d'
11901190
</listitem>
11911191
</varlistentry>
11921192

1193-
<varlistentry id="guc-gss-accept-deleg" xreflabel="gss_accept_deleg">
1194-
<term><varname>gss_accept_deleg</varname> (<type>boolean</type>)
1193+
<varlistentry id="guc-gss-accept-deleg" xreflabel="gss_accept_delegation">
1194+
<term><varname>gss_accept_delegation</varname> (<type>boolean</type>)
11951195
<indexterm>
1196-
<primary><varname>gss_accept_deleg</varname> configuration parameter</primary>
1196+
<primary><varname>gss_accept_delegation</varname> configuration parameter</primary>
11971197
</indexterm>
11981198
</term>
11991199
<listitem>

‎doc/src/sgml/release-16.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ Add support for Kerberos credential delegation (Stephen Frost)
946946
</para>
947947

948948
<para>
949-
This is enabled with server variablegss_accept_deleg.
949+
This is enabled with server variablegss_accept_delegation.
950950
</para>
951951
</listitem>
952952

‎src/backend/libpq/auth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static intCheckCertAuth(Port *port);
165165
*/
166166
char*pg_krb_server_keyfile;
167167
boolpg_krb_caseins_users;
168-
boolpg_gss_accept_deleg;
168+
boolpg_gss_accept_delegation;
169169

170170

171171
/*----------------------------------------------------------------
@@ -1003,7 +1003,7 @@ pg_GSS_recvauth(Port *port)
10031003
&port->gss->outbuf,
10041004
&gflags,
10051005
NULL,
1006-
pg_gss_accept_deleg ?&delegated_creds :NULL);
1006+
pg_gss_accept_delegation ?&delegated_creds :NULL);
10071007

10081008
/* gbuf no longer used */
10091009
pfree(buf.data);

‎src/backend/libpq/be-secure-gssapi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ secure_open_gssapi(Port *port)
593593
GSS_C_NO_CREDENTIAL,&input,
594594
GSS_C_NO_CHANNEL_BINDINGS,
595595
&port->gss->name,NULL,&output,NULL,
596-
NULL,pg_gss_accept_deleg ?&delegated_creds :NULL);
596+
NULL,pg_gss_accept_delegation ?&delegated_creds :NULL);
597597

598598
if (GSS_ERROR(major))
599599
{
@@ -749,7 +749,7 @@ be_gssapi_get_princ(Port *port)
749749
* connection.
750750
*/
751751
bool
752-
be_gssapi_get_deleg(Port*port)
752+
be_gssapi_get_delegation(Port*port)
753753
{
754754
if (!port|| !port->gss)
755755
return false;

‎src/backend/utils/activity/backend_status.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ pgstat_bestart(void)
384384
lbeentry.st_gss= true;
385385
lgssstatus.gss_auth=be_gssapi_get_auth(MyProcPort);
386386
lgssstatus.gss_enc=be_gssapi_get_enc(MyProcPort);
387-
lgssstatus.gss_deleg=be_gssapi_get_deleg(MyProcPort);
387+
lgssstatus.gss_delegation=be_gssapi_get_delegation(MyProcPort);
388388
if (princ)
389389
strlcpy(lgssstatus.gss_princ,princ,NAMEDATALEN);
390390
}

‎src/backend/utils/adt/pgstatfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
600600
values[25]=BoolGetDatum(beentry->st_gssstatus->gss_auth);/* gss_auth */
601601
values[26]=CStringGetTextDatum(beentry->st_gssstatus->gss_princ);
602602
values[27]=BoolGetDatum(beentry->st_gssstatus->gss_enc);/* GSS Encryption in use */
603-
values[28]=BoolGetDatum(beentry->st_gssstatus->gss_deleg);/* GSS credentials
603+
values[28]=BoolGetDatum(beentry->st_gssstatus->gss_delegation);/* GSS credentials
604604
* delegated */
605605
}
606606
else

‎src/backend/utils/init/postinit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,14 +285,14 @@ PerformAuthentication(Port *port)
285285
_(" GSS (authenticated=%s, encrypted=%s, deleg_credentials=%s, principal=%s)"),
286286
be_gssapi_get_auth(port) ?_("yes") :_("no"),
287287
be_gssapi_get_enc(port) ?_("yes") :_("no"),
288-
be_gssapi_get_deleg(port) ?_("yes") :_("no"),
288+
be_gssapi_get_delegation(port) ?_("yes") :_("no"),
289289
princ);
290290
else
291291
appendStringInfo(&logmsg,
292292
_(" GSS (authenticated=%s, encrypted=%s, deleg_credentials=%s)"),
293293
be_gssapi_get_auth(port) ?_("yes") :_("no"),
294294
be_gssapi_get_enc(port) ?_("yes") :_("no"),
295-
be_gssapi_get_deleg(port) ?_("yes") :_("no"));
295+
be_gssapi_get_delegation(port) ?_("yes") :_("no"));
296296
}
297297
#endif
298298

‎src/backend/utils/misc/guc_tables.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,11 +1728,11 @@ struct config_bool ConfigureNamesBool[] =
17281728
},
17291729

17301730
{
1731-
{"gss_accept_deleg",PGC_SIGHUP,CONN_AUTH_AUTH,
1731+
{"gss_accept_delegation",PGC_SIGHUP,CONN_AUTH_AUTH,
17321732
gettext_noop("Sets whether GSSAPI delegation should be accepted from the client."),
17331733
NULL
17341734
},
1735-
&pg_gss_accept_deleg,
1735+
&pg_gss_accept_delegation,
17361736
false,
17371737
NULL,NULL,NULL
17381738
},

‎src/include/libpq/auth.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
externPGDLLIMPORTchar*pg_krb_server_keyfile;
2020
externPGDLLIMPORTboolpg_krb_caseins_users;
21-
externPGDLLIMPORTboolpg_gss_accept_deleg;
21+
externPGDLLIMPORTboolpg_gss_accept_delegation;
2222
externPGDLLIMPORTchar*pg_krb_realm;
2323

2424
externvoidClientAuthentication(Port*port);

‎src/include/libpq/libpq-be.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ extern PGDLLIMPORT openssl_tls_init_hook_typ openssl_tls_init_hook;
329329
externboolbe_gssapi_get_auth(Port*port);
330330
externboolbe_gssapi_get_enc(Port*port);
331331
externconstchar*be_gssapi_get_princ(Port*port);
332-
externboolbe_gssapi_get_deleg(Port*port);
332+
externboolbe_gssapi_get_delegation(Port*port);
333333

334334
/* Read and write to a GSSAPI-encrypted connection. */
335335
externssize_tbe_gssapi_read(Port*port,void*ptr,size_tlen);

‎src/include/utils/backend_status.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ typedef struct PgBackendGSSStatus
7777
chargss_princ[NAMEDATALEN];/* GSSAPI Principal used to auth */
7878
boolgss_auth;/* If GSSAPI authentication was used */
7979
boolgss_enc;/* If encryption is being used */
80-
boolgss_deleg;/* If credentials delegated */
80+
boolgss_delegation;/* If credentials delegated */
8181

8282
}PgBackendGSSStatus;
8383

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp