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

8199636: Unify naming for jaas_unix and jaas_nt

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2018-03-15 01:32:03 +01:00
parent f74d0aef61
commit 9f1e654058
3 changed files with 3 additions and 8 deletions
make/lib
Lib-jdk.security.auth.gmk
src/jdk.security.auth/share/classes/com/sun/security/auth/module
NTSystem.javaUnixSystem.java

7
make/lib/Lib-jdk.security.auth.gmk

@ -33,13 +33,8 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
LIBJAAS_MAPFILE := $(TOPDIR)/make/mapfiles/libjaas/mapfile-vers
endif
LIBJAAS_NAME := jaas_unix
ifeq ($(OPENJDK_TARGET_OS), windows)
LIBJAAS_NAME := jaas_nt
endif
$(eval $(call SetupJdkLibrary, BUILD_LIBJAAS, \
NAME := $(LIBJAAS_NAME), \
NAME := jaas, \
SRC := $(call FindSrcDirsForLib, jdk.security.auth, jaas), \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.security.auth, \

2
src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTSystem.java

@ -128,6 +128,6 @@ public class NTSystem {
private void loadNative() {
System.loadLibrary("jaas_nt");
System.loadLibrary("jaas");
}
}

2
src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java

@ -43,7 +43,7 @@ public class UnixSystem {
* the native library to access the underlying system information.
*/
public UnixSystem() {
System.loadLibrary("jaas_unix");
System.loadLibrary("jaas");
getUnixInfo();
}