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 su...@apache.org on 2012/11/06 23:23:52 UTC

svn commit: r1406379 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/security/SecurityUtilTestHelper.java src/test/java/org/apache/hadoop/security/TestUGIWithExternalKdc.java

Author: suresh
Date: Tue Nov  6 22:23:51 2012
New Revision: 1406379

URL: http://svn.apache.org/viewvc?rev=1406379&view=rev
Log:
HADOOP-9004. Reverting the commit r1406202 to address patch issue

Removed:
    hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUGIWithExternalKdc.java
Modified:
    hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/SecurityUtilTestHelper.java

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1406379&r1=1406378&r2=1406379&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Nov  6 22:23:51 2012
@@ -129,9 +129,6 @@ Trunk (Unreleased)
     HADOOP-8776. Provide an option in test-patch that can enable/disable
     compiling native code. (Chris Nauroth via suresh)
 
-    HADOOP-9004. Allow security unit tests to use external KDC. (Stephen Chu
-    via suresh)
-
   BUG FIXES
 
     HADOOP-8177. MBeans shouldn't try to register when it fails to create MBeanName.

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/SecurityUtilTestHelper.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/SecurityUtilTestHelper.java?rev=1406379&r1=1406378&r2=1406379&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/SecurityUtilTestHelper.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/SecurityUtilTestHelper.java Tue Nov  6 22:23:51 2012
@@ -27,19 +27,4 @@ public class SecurityUtilTestHelper {
   public static void setTokenServiceUseIp(boolean flag) {
     SecurityUtil.setTokenServiceUseIp(flag);
   }
-
-  /**
-   * Return true if externalKdc=true and the location of the krb5.conf
-   * file has been specified, and false otherwise.
-   */
-  public static boolean isExternalKdcRunning() {
-    String externalKdc = System.getProperty("externalKdc");
-    String krb5Conf = System.getProperty("java.security.krb5.conf");
-    if(externalKdc == null || !externalKdc.equals("true") ||
-       krb5Conf == null) {
-      return false;
-    }
-    return true;
-  }
-
 }