stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8031046: Native Windows ccache might still get unsupported ticket

Browse Source 
Reviewed-by: valeriep
This commit is contained in:
Weijun Wang 2014-01-14 13:31:44 +08:00
parent 520ada1ca7
commit f7868d3299
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jdk/src/windows/native/sun/security/krb5/NativeCreds.c
View File

@ -388,7 +388,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ
jobject ticketFlags, startTime, endTime, krbCreds = NULL; jobject ticketFlags, startTime, endTime, krbCreds = NULL;
jobject authTime, renewTillTime, hostAddresses = NULL; jobject authTime, renewTillTime, hostAddresses = NULL;
KERB_EXTERNAL_TICKET *msticket; KERB_EXTERNAL_TICKET *msticket;
int found_in_cache = 0; int found = 0;
FILETIME Now, EndTime, LocalEndTime; FILETIME Now, EndTime, LocalEndTime;
int i, netypes; int i, netypes;
@ -476,7 +476,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ
if (CompareFileTime(&Now, &LocalEndTime) < 0) { if (CompareFileTime(&Now, &LocalEndTime) < 0) {
for (i=0; i<netypes; i++) { for (i=0; i<netypes; i++) {
if (etypes[i] == msticket->SessionKey.KeyType) { if (etypes[i] == msticket->SessionKey.KeyType) {
found_in_cache = 1; found = 1;
if (native_debug) { if (native_debug) {
printf("LSA: Valid etype found: %d\n", etypes[i]); printf("LSA: Valid etype found: %d\n", etypes[i]);
} }
@ -486,7 +486,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ
} }
} }
if (!found_in_cache) { if (!found) {
if (native_debug) { if (native_debug) {
printf("LSA: MS TGT in cache is invalid/not supported; request new ticket\n"); printf("LSA: MS TGT in cache is invalid/not supported; request new ticket\n");
} }
@ -529,6 +529,14 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ
// got the native MS Kerberos TGT // got the native MS Kerberos TGT
msticket = &(pTicketResponse->Ticket); msticket = &(pTicketResponse->Ticket);
if (msticket->SessionKey.KeyType != etypes[i]) {
if (native_debug) {
printf("LSA: Response etype is %d for %d. Retry.\n", msticket->SessionKey.KeyType, etypes[i]);
}
continue;
}
found = 1;
break; break;
} }
} }
@ -583,6 +591,10 @@ JNIEXPORT jobject JNICALL Java_sun_security_krb5_Credentials_acquireDefaultNativ
} KERB_CRYPTO_KEY, *PKERB_CRYPTO_KEY; } KERB_CRYPTO_KEY, *PKERB_CRYPTO_KEY;
*/ */
if (!found) {
break;
}
// Build a com.sun.security.krb5.Ticket // Build a com.sun.security.krb5.Ticket
ticket = BuildTicket(env, msticket->EncodedTicket, ticket = BuildTicket(env, msticket->EncodedTicket,
msticket->EncodedTicketSize); msticket->EncodedTicketSize);