Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 52392 invoked from network); 4 Mar 2011 04:13:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 04:13:23 -0000 Received: (qmail 34205 invoked by uid 500); 4 Mar 2011 04:13:22 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 34172 invoked by uid 500); 4 Mar 2011 04:13:22 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 34163 invoked by uid 99); 4 Mar 2011 04:13:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 04:13:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 04:13:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 689072388A38; Fri, 4 Mar 2011 04:12:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1077419 - /hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/security/KerberosName.java Date: Fri, 04 Mar 2011 04:12:59 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304041259.689072388A38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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 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=""; } }