From f4a8543fc3e9ccd489f22d30cac949bc249c8ea0 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Wed, 12 Nov 2025 06:48:02 -0500 Subject: [PATCH] Attend to @smemery's code review comments --- make/test/JtregNativeJdk.gmk | 4 ++-- .../share/classes/sun/security/krb5/Credentials.java | 2 +- .../share/native/libkrb5shared/nativeccache.c | 2 +- test/jdk/sun/security/krb5/native/NativeCacheTest.java | 1 - .../sun/security/krb5/native/libNativeCredentialCacheHelper.c | 3 ++- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk index 74b26a4ba61..dece0fb4954 100644 --- a/make/test/JtregNativeJdk.gmk +++ b/make/test/JtregNativeJdk.gmk @@ -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 diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java b/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java index e9fb0875436..9577e02b008 100644 --- a/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java +++ b/src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java @@ -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 diff --git a/src/java.security.jgss/share/native/libkrb5shared/nativeccache.c b/src/java.security.jgss/share/native/libkrb5shared/nativeccache.c index 4a98ec544e2..819d3ddeb93 100644 --- a/src/java.security.jgss/share/native/libkrb5shared/nativeccache.c +++ b/src/java.security.jgss/share/native/libkrb5shared/nativeccache.c @@ -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 diff --git a/test/jdk/sun/security/krb5/native/NativeCacheTest.java b/test/jdk/sun/security/krb5/native/NativeCacheTest.java index 7becb4218c8..5572e8e91c3 100644 --- a/test/jdk/sun/security/krb5/native/NativeCacheTest.java +++ b/test/jdk/sun/security/krb5/native/NativeCacheTest.java @@ -23,7 +23,6 @@ /* * @test - * @bug 8123456 * @summary Test JAAS access to in-memory credential caches * @library /test/lib ../auto * @requires os.family != "windows" diff --git a/test/jdk/sun/security/krb5/native/libNativeCredentialCacheHelper.c b/test/jdk/sun/security/krb5/native/libNativeCredentialCacheHelper.c index 344f03a2706..94e19f4ec7a 100644 --- a/test/jdk/sun/security/krb5/native/libNativeCredentialCacheHelper.c +++ b/test/jdk/sun/security/krb5/native/libNativeCredentialCacheHelper.c @@ -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