From e70025b903f269f57cc620f9c8a863067862aaaf Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Wed, 26 Oct 2011 22:25:12 +0000 Subject: [PATCH] svn merge -c 1189357 from trunk for HADOOP-7766. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189506 13f79535-47bb-0310-9956-ffa450edef68 --- .../authentication/server/KerberosAuthenticationHandler.java | 3 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java index d7145b1824b..38b51cbaa75 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java @@ -151,9 +151,6 @@ public void init(Properties config) throws ServletException { throw new ServletException("Keytab does not exist: " + keytab); } - String nameRules = config.getProperty(NAME_RULES, "DEFAULT"); - KerberosName.setRules(nameRules); - Set principals = new HashSet(); principals.add(new KerberosPrincipal(principal)); Subject subject = new Subject(false, principals, new HashSet(), new HashSet()); diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 7e5da938f67..09e5f8768d3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -4,6 +4,9 @@ Hadoop Change Log HADOOP-7721. Add log before login in KerberosAuthenticationHandler. (jitendra) + HADOOP-7766. The auth to local mappings are not being respected, with webhdfs + and security enabled. (jitendra) + Release 0.23.0 - Unreleased INCOMPATIBLE CHANGES