Author: ddas
Date: Thu Feb  4 07:46:20 2010
New Revision: 906388

URL: http://svn.apache.org/viewvc?rev=906388&view=rev
Log:
HADOOP-6538. Sets hadoop.security.authentication to simple by default. 
Contributed by Devaraj Das.

Modified:
    hadoop/common/trunk/CHANGES.txt
    hadoop/common/trunk/src/java/core-default.xml
    
hadoop/common/trunk/src/java/org/apache/hadoop/security/UserGroupInformation.java

Modified: hadoop/common/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=906388&r1=906387&r2=906388&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Thu Feb  4 07:46:20 2010
@@ -169,6 +169,9 @@
     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

Modified: hadoop/common/trunk/src/java/core-default.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/core-default.xml?rev=906388&r1=906387&r2=906388&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/core-default.xml (original)
+++ hadoop/common/trunk/src/java/core-default.xml Thu Feb  4 07:46:20 2010
@@ -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>

Modified: 
hadoop/common/trunk/src/java/org/apache/hadoop/security/UserGroupInformation.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/security/UserGroupInformation.java?rev=906388&r1=906387&r2=906388&view=diff
==============================================================================
--- 
hadoop/common/trunk/src/java/org/apache/hadoop/security/UserGroupInformation.java
 (original)
+++ 
hadoop/common/trunk/src/java/org/apache/hadoop/security/UserGroupInformation.java
 Thu Feb  4 07:46:20 2010
@@ -151,9 +151,9 @@
    */
   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 " +


Reply via email to