archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8224025: Fix for JDK-8220302 is not complete

Browse source 
Reviewed-by: ahgross, mullan, valeriep
This commit is contained in:
Weijun Wang 2019-05-21 08:37:30 +08:00
parent 12bf1b15ab
commit fdae3113a1
1 changed files with 44 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c
View file

@ -247,6 +247,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ
int netypes; int netypes;
jint *etypes = NULL; jint *etypes = NULL;
int proxy_flag = 0;
/* Initialize the Kerberos 5 context */ /* Initialize the Kerberos 5 context */
err = krb5_init_context (&kcontext); err = krb5_init_context (&kcontext);
@ -259,6 +260,48 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ
err = krb5_cc_set_flags (kcontext, ccache, flags); /* turn off OPENCLOSE */ err = krb5_cc_set_flags (kcontext, ccache, flags); /* turn off OPENCLOSE */
} }
// First round read. The proxy_impersonator config flag is not supported.
// This ccache will not be used if this flag exists.
if (!err) {
err = krb5_cc_start_seq_get (kcontext, ccache, &cursor);
}
if (!err) {
while ((err = krb5_cc_next_cred (kcontext, ccache, &cursor, &creds)) == 0) {
char *serverName = NULL;
if (!err) {
err = krb5_unparse_name (kcontext, creds.server, &serverName);
printiferr (err, "while unparsing server name");
}
if (!err) {
if (!strcmp(serverName, "krb5_ccache_conf_data/proxy_impersonator@X-CACHECONF:")) {
proxy_flag = 1;
}
}
if (serverName != NULL) { krb5_free_unparsed_name (kcontext, serverName); }
krb5_free_cred_contents (kcontext, &creds);
if (proxy_flag) break;
}
if (err == KRB5_CC_END) { err = 0; }
printiferr (err, "while retrieving a ticket");
}
if (!err) {
err = krb5_cc_end_seq_get (kcontext, ccache, &cursor);
printiferr (err, "while finishing ticket retrieval");
}
if (proxy_flag) {
goto outer_cleanup;
}
// End of first round read
if (!err) { if (!err) {
err = krb5_cc_start_seq_get (kcontext, ccache, &cursor); err = krb5_cc_start_seq_get (kcontext, ccache, &cursor);
} }
@ -388,6 +431,7 @@ cleanup:
printiferr (err, "while finishing ticket retrieval"); printiferr (err, "while finishing ticket retrieval");
} }
outer_cleanup:
if (!err) { if (!err) {
flags = KRB5_TC_OPENCLOSE; /* restore OPENCLOSE mode */ flags = KRB5_TC_OPENCLOSE; /* restore OPENCLOSE mode */
err = krb5_cc_set_flags (kcontext, ccache, flags); err = krb5_cc_set_flags (kcontext, ccache, flags);