You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by at...@apache.org on 2013/02/13 20:42:13 UTC
svn commit: r1445884 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt
src/main/java/org/apache/hadoop/security/UserGroupInformation.java
Author: atm
Date: Wed Feb 13 19:42:13 2013
New Revision: 1445884
URL: http://svn.apache.org/r1445884
Log:
HADOOP-9305. Add support for running the Hadoop client on 64-bit AIX. Contributed by Aaron T. Myers.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1445884&r1=1445883&r2=1445884&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Feb 13 19:42:13 2013
@@ -360,6 +360,8 @@ Release 2.0.4-beta - UNRELEASED
HADOOP-9294. GetGroupsTestBase fails on Windows. (Chris Nauroth via suresh)
+ HADOOP-9305. Add support for running the Hadoop client on 64-bit AIX. (atm)
+
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1445884&r1=1445883&r2=1445884&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java Wed Feb 13 19:42:13 2013
@@ -316,7 +316,8 @@ public class UserGroupInformation {
return is64Bit ? "com.ibm.security.auth.module.Win64LoginModule"
: "com.ibm.security.auth.module.NTLoginModule";
} else if (aix) {
- return "com.ibm.security.auth.module.AIXLoginModule";
+ return is64Bit ? "com.ibm.security.auth.module.AIX64LoginModule"
+ : "com.ibm.security.auth.module.AIXLoginModule";
} else {
return "com.ibm.security.auth.module.LinuxLoginModule";
}
@@ -331,24 +332,24 @@ public class UserGroupInformation {
private static Class<? extends Principal> getOsPrincipalClass() {
ClassLoader cl = ClassLoader.getSystemClassLoader();
try {
+ String principalClass = null;
if (ibmJava) {
- if (windows) {
- return (Class<? extends Principal>) (is64Bit
- ? cl.loadClass("com.ibm.security.auth.UsernamePrincipal")
- : cl.loadClass("com.ibm.security.auth.NTUserPrincipal"));
- } else if (aix) {
- return (Class<? extends Principal>)
- cl.loadClass("com.ibm.security.auth.AIXPrincipal");
+ if (is64Bit) {
+ principalClass = "com.ibm.security.auth.UsernamePrincipal";
} else {
- return (Class<? extends Principal>) (is64Bit
- ? cl.loadClass("com.ibm.security.auth.UsernamePrincipal")
- : cl.loadClass("com.ibm.security.auth.LinuxPrincipal"));
+ if (windows) {
+ principalClass = "com.ibm.security.auth.NTUserPrincipal";
+ } else if (aix) {
+ principalClass = "com.ibm.security.auth.AIXPrincipal";
+ } else {
+ principalClass = "com.ibm.security.auth.LinuxPrincipal";
+ }
}
} else {
- return (Class<? extends Principal>) (windows
- ? cl.loadClass("com.sun.security.auth.NTUserPrincipal")
- : cl.loadClass("com.sun.security.auth.UnixPrincipal"));
+ principalClass = windows ? "com.sun.security.auth.NTUserPrincipal"
+ : "com.sun.security.auth.UnixPrincipal";
}
+ return (Class<? extends Principal>) cl.loadClass(principalClass);
} catch (ClassNotFoundException e) {
LOG.error("Unable to find JAAS classes:" + e.getMessage());
}