浏览代码

HADOOP-6538. Sets hadoop.security.authentication to simple by default. Contributed by Devaraj Das.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@906388 13f79535-47bb-0310-9956-ffa450edef68
Devaraj Das 15 年之前
父节点
当前提交
f786508cd3
共有 3 个文件被更改,包括 12 次插入2 次删除
  1. 3 0
      CHANGES.txt
  2. 7 0
      src/java/core-default.xml
  3. 2 2
      src/java/org/apache/hadoop/security/UserGroupInformation.java

+ 3 - 0
CHANGES.txt

@@ -169,6 +169,9 @@ Trunk (unreleased changes)
     HADOOP-6517. Fix UserGroupInformation so that tokens are saved/retrieved
     to/from the embedded Subject (Owen O'Malley & Kan Zhang via ddas)
 
+    HADOOP-6538. Sets hadoop.security.authentication to simple by default.
+    (ddas)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

+ 7 - 0
src/java/core-default.xml

@@ -59,6 +59,13 @@
   <description>Is service-level authorization enabled?</description>
 </property>
 
+<property>
+  <name>hadoop.security.authentication</name>
+  <value>simple</value>
+  <description>Possible values are simple (no authentication), and kerberos
+  </description>
+</property>
+
 <!--- logging properties -->
 
 <property>

+ 2 - 2
src/java/org/apache/hadoop/security/UserGroupInformation.java

@@ -151,9 +151,9 @@ public class UserGroupInformation {
    */
   private static synchronized void initialize(Configuration conf) {
     String value = conf.get(HADOOP_SECURITY_AUTHENTICATION);
-    if ("simple".equals(value)) {
+    if (value == null || "simple".equals(value)) {
       useKerberos = false;
-    } else if (value == null || "kerberos".equals(value)) {
+    } else if ("kerberos".equals(value)) {
       useKerberos = true;
     } else {
       throw new IllegalArgumentException("Invalid attribute value for " +