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 ji...@apache.org on 2011/09/23 03:36:48 UTC
svn commit: r1174487 - in /hadoop/common/branches/branch-0.20-security-205:
./ src/core/org/apache/hadoop/security/
src/core/org/apache/hadoop/security/authentication/server/
src/core/org/apache/hadoop/security/authentication/util/
src/test/org/apache/...
Author: jitendra
Date: Fri Sep 23 01:36:48 2011
New Revision: 1174487
URL: http://svn.apache.org/viewvc?rev=1174487&view=rev
Log:
Merged r1174482 from branch-0.20-security for HADOOP-7674.
Removed:
hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/security/authentication/util/KerberosName.java
hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/util/TestKerberosName.java
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/security/KerberosName.java
hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1174487&r1=1174486&r2=1174487&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Fri Sep 23 01:36:48 2011
@@ -36,9 +36,6 @@ Release 0.20.205.0 - 2011.09.12
HDFS-2317. Support read access to HDFS in webhdfs. (szetszwo)
- HADOOP-7645. HTTP auth tests requiring Kerberos infrastructure are not
- disabled on branch-0.20-security. (jitendra)
-
HDFS-2338. Add configuration option to enable/disable webhdfs.
(jitendra via szetszwo)
@@ -192,6 +189,11 @@ Release 0.20.205.0 - 2011.09.12
HDFS-2331. Fix WebHdfsFileSystem compilation problems for a bug in JDK
version < 1.6.0_26. (Abhijit Suresh Shingate via szetszwo)
+ HADOOP-7645. HTTP auth tests requiring Kerberos infrastructure are not
+ disabled on branch-0.20-security. (jitendra)
+
+ HADOOP-7674. TestKerberosName fails in 20 branch. (jitendra)
+
HDFS-2333. Change DFSOutputStream back to package private, otherwise,
there are two SC_START_IN_CTOR findbugs warnings. (szetszwo)
Propchange: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 01:36:48 2011
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1170087,1170997,1171137,1171181,1171380,1171891,1171905,1172184,1172188,1172190,1172192,1173843,1174326,1174471,1174476
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1170087,1170997,1171137,1171181,1171380,1171891,1171905,1172184,1172188,1172190,1172192,1173843,1174326,1174471,1174476,1174482
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1152887,1154413,1159730,1161741
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Modified: hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/security/KerberosName.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/security/KerberosName.java?rev=1174487&r1=1174486&r2=1174487&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/security/KerberosName.java (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/security/KerberosName.java Fri Sep 23 01:36:48 2011
@@ -342,6 +342,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 {
@@ -386,7 +394,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.20-security-205/src/core/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java?rev=1174487&r1=1174486&r2=1174487&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/core/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java Fri Sep 23 01:36:48 2011
@@ -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.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSManager;