infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-30 21:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attend to @smemery's code review comments

Browse Source
This commit is contained in:
Nick Hall 2025-11-12 06:48:02 -05:00
parent 8c8288a31c
commit f4a8543fc3
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/test/JtregNativeJdk.gmk
View File

@ -122,8 +122,8 @@ ifeq ($(call isTargetOs, linux), true)
endif
else ifeq ($(call isTargetOs, macosx), true)
# macOS: build with system krb5 and disable deprecation warnings
BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libNativeCredentialCacheHelper := -lkrb5 -lcom_err
BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libNativeCredentialCacheHelper := -Wno-deprecated-declarations
BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libNativeCredentialCacheHelper := $(KRB5_LIBS)
BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libNativeCredentialCacheHelper := $(KRB5_CFLAGS) -Wno-deprecated-declarations
else
# Other platforms: exclude the library
BUILD_JDK_JTREG_EXCLUDE += libNativeCredentialCacheHelper.c

2
src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it

2
src/java.security.jgss/share/native/libkrb5shared/nativeccache.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it

1
test/jdk/sun/security/krb5/native/NativeCacheTest.java
View File

@ -23,7 +23,6 @@
/*
* @test
* @bug 8123456
* @summary Test JAAS access to in-memory credential caches
* @library /test/lib ../auto
* @requires os.family != "windows"

3
test/jdk/sun/security/krb5/native/libNativeCredentialCacheHelper.c
View File

@ -69,6 +69,8 @@ static char* jstring_to_cstring(JNIEnv *env, jstring jstr) {
if (utf_chars == NULL) return NULL;
char *result = strdup(utf_chars);
if (result == NULL) return NULL;
(*env)->ReleaseStringUTFChars(env, jstr, utf_chars);
return result;
}
@ -140,7 +142,6 @@ JNIEXPORT jboolean JNICALL Java_NativeCredentialCacheHelper_setDefaultCache
return JNI_TRUE;
}
/**
* Copy real Kerberos credentials from a source cache to an in-memory cache.
* in-memory cache. Used to move OneKDC-generated TGTs to an in-memory cache