This is an automated email from the ASF dual-hosted git repository.
eyang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new e589f61 HADOOP-16590. Update OS login modules for IBM JDK.
Contributed by Nicholas Marion
e589f61 is described below
commit e589f6199c562cb1e478a38f5f2c5dee94880258
Author: Eric Yang <ey...@apache.org>
AuthorDate: Fri Jan 10 14:32:02 2020 -0500
HADOOP-16590. Update OS login modules for IBM JDK.
Contributed by Nicholas Marion
Close #1484
---
.../hadoop/security/UserGroupInformation.java | 28 ++++------------------
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
index 884380c..8c84a8d 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
@@ -427,23 +427,12 @@ public class UserGroupInformation {
private static final boolean windows =
System.getProperty("os.name").startsWith("Windows");
- private static final boolean is64Bit =
- System.getProperty("os.arch").contains("64") ||
- System.getProperty("os.arch").contains("s390x");
- private static final boolean aix =
System.getProperty("os.name").equals("AIX");
/* Return the OS login module class name */
+ /* For IBM JDK, use the common OS login module class name for all platforms
*/
private static String getOSLoginModuleName() {
if (IBM_JAVA) {
- if (windows) {
- return is64Bit ? "com.ibm.security.auth.module.Win64LoginModule"
- : "com.ibm.security.auth.module.NTLoginModule";
- } else if (aix) {
- return is64Bit ? "com.ibm.security.auth.module.AIX64LoginModule"
- : "com.ibm.security.auth.module.AIXLoginModule";
- } else {
- return "com.ibm.security.auth.module.LinuxLoginModule";
- }
+ return "com.ibm.security.auth.module.JAASLoginModule";
} else {
return windows ? "com.sun.security.auth.module.NTLoginModule"
: "com.sun.security.auth.module.UnixLoginModule";
@@ -451,23 +440,14 @@ public class UserGroupInformation {
}
/* Return the OS principal class */
+ /* For IBM JDK, use the common OS principal class for all platforms */
@SuppressWarnings("unchecked")
private static Class<? extends Principal> getOsPrincipalClass() {
ClassLoader cl = ClassLoader.getSystemClassLoader();
try {
String principalClass = null;
if (IBM_JAVA) {
- if (is64Bit) {
- principalClass = "com.ibm.security.auth.UsernamePrincipal";
- } else {
- if (windows) {
- principalClass = "com.ibm.security.auth.NTUserPrincipal";
- } else if (aix) {
- principalClass = "com.ibm.security.auth.AIXPrincipal";
- } else {
- principalClass = "com.ibm.security.auth.LinuxPrincipal";
- }
- }
+ principalClass = "com.ibm.security.auth.UsernamePrincipal";
} else {
principalClass = windows ? "com.sun.security.auth.NTUserPrincipal"
: "com.sun.security.auth.UnixPrincipal";
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
