Author: shv
Date: Tue Jun 5 03:32:27 2012
New Revision: 1346225
URL: http://svn.apache.org/viewvc?rev=1346225&view=rev
Log:
HADOOP-7674. Fix TestKerberosName. Contributed by Jitendra Pandey and Benoy
Antony.
Removed:
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/authentication/util/KerberosName.java
hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/security/authentication/util/TestKerberosName.java
Modified:
hadoop/common/branches/branch-0.22/common/CHANGES.txt
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/KerberosName.java
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1346225&r1=1346224&r2=1346225&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Tue Jun 5 03:32:27
2012
@@ -29,6 +29,8 @@ Release 0.22.1 - Unreleased
HADOOP-8381. Substitute _HOST with hostname for HTTP principals.
(Benoy Antony via shv)
+ HADOOP-7674. Fix TestKerberosName. (Benoy Antony via shv)
+
Release 0.22.0 - 2011-11-29
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/KerberosName.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/KerberosName.java?rev=1346225&r1=1346224&r2=1346225&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/KerberosName.java
(original)
+++
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/KerberosName.java
Tue Jun 5 03:32:27 2012
@@ -347,6 +347,14 @@ public class KerberosName {
String ruleString = conf.get("hadoop.security.auth_to_local", "DEFAULT");
rules = parseRules(ruleString);
}
+
+ /**
+ * Set the rules.
+ * @param ruleString the rules string.
+ */
+ public static void setRules(String ruleString) {
+ rules = parseRules(ruleString);
+ }
@SuppressWarnings("serial")
public static class BadFormatString extends IOException {
@@ -391,7 +399,7 @@ public class KerberosName {
throw new NoMatchingRule("No rules applied to " + toString());
}
- static void printRules() throws IOException {
+ public static void printRules() throws IOException {
int i = 0;
for(Rule r: rules) {
System.out.println(++i + " " + r);
Modified:
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java?rev=1346225&r1=1346224&r2=1346225&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
(original)
+++
hadoop/common/branches/branch-0.22/common/src/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
Tue Jun 5 03:32:27 2012
@@ -17,7 +17,7 @@ import org.apache.hadoop.security.authen
import org.apache.hadoop.security.authentication.client.KerberosAuthenticator;
import com.sun.security.auth.module.Krb5LoginModule;
import org.apache.commons.codec.binary.Base64;
-import org.apache.hadoop.security.authentication.util.KerberosName;
+import org.apache.hadoop.security.KerberosName;
import org.apache.hadoop.security.SecurityUtil;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
