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 05:12:59 UTC

svn commit: r1077419 - /hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/KerberosName.java

Author: omalley
Date: Fri Mar  4 04:12:59 2011
New Revision: 1077419

URL: http://svn.apache.org/viewvc?rev=1077419&view=rev
Log:
commit 42d001e3b4187cf27d973e323feebb5296499f2d
Author: Boris Shkolnik <bo...@yahoo-inc.com>
Date:   Thu Apr 22 10:13:04 2010 -0700

    HADOOP:6716 from https://issues.apache.org/jira/secure/attachment/12442487/HADOOP-6716-BP20-3.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    HADOOP-6716. System won't start in non-secure mode when kerb5.conf
    +   (edu.mit.kerberos on Mac) is not present. (boryas)
    +

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

Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/KerberosName.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/KerberosName.java?rev=1077419&r1=1077418&r2=1077419&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/KerberosName.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/KerberosName.java Fri Mar  4 04:12:59 2011
@@ -73,14 +73,17 @@ public class KerberosName {
   private static List<Rule> rules;
 
   private static String defaultRealm;
-  private static final Config kerbConf;
+  private static Config kerbConf;
   
   static {
     try {
       kerbConf = Config.getInstance();
       defaultRealm = kerbConf.getDefaultRealm();
     } catch (KrbException ke) {
-      throw new IllegalArgumentException("Can't get Kerberos configuration",ke);
+      if(UserGroupInformation.isSecurityEnabled())
+        throw new IllegalArgumentException("Can't get Kerberos configuration",ke);
+      else 
+        defaultRealm="";
     }
   }