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 om...@apache.org on 2011/03/04 04:46:07 UTC

svn commit: r1077149 - in /hadoop/common/branches/branch-0.20-security-patches/src/core: core-default.xml org/apache/hadoop/security/UserGroupInformation.java

Author: omalley
Date: Fri Mar  4 03:46:07 2011
New Revision: 1077149

URL: http://svn.apache.org/viewvc?rev=1077149&view=rev
Log:
commit 295ee58e3fd04967f35b59fd3c3a4a7546c66a9e
Author: Devaraj Das <dd...@yahoo-inc.com>
Date:   Fri Feb 5 15:29:26 2010 -0800

    HADOOP:6538 from https://issues.apache.org/jira/secure/attachment/12435031/6538-bp20.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    HADOOP-6538. Sets hadoop.security.authentication to simple by default.
    +    (ddas)
    +

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/core/core-default.xml
    hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/UserGroupInformation.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/core-default.xml?rev=1077149&r1=1077148&r2=1077149&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/core-default.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/core-default.xml Fri Mar  4 03:46:07 2011
@@ -37,6 +37,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/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/UserGroupInformation.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/UserGroupInformation.java?rev=1077149&r1=1077148&r2=1077149&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/UserGroupInformation.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/UserGroupInformation.java Fri Mar  4 03:46:07 2011
@@ -146,9 +146,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 " +