ZKUtil#isSecureZooKeeper should check more app configuration entries (Enis Söztutar)

Author: apurtell

hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java

@@ -1001,7 +1001,11 @@ public static boolean isSecureZooKeeper(Configuration conf) {
     try {
       javax.security.auth.login.Configuration testConfig =
           javax.security.auth.login.Configuration.getConfiguration();
-      if(testConfig.getAppConfigurationEntry("Client") == null) {
+      if (testConfig.getAppConfigurationEntry("Client") == null
+          && testConfig.getAppConfigurationEntry(
+            JaasConfiguration.CLIENT_KEYTAB_KERBEROS_CONFIG_NAME) == null
+          && testConfig.getAppConfigurationEntry(
+            JaasConfiguration.SERVER_KEYTAB_KERBEROS_CONFIG_NAME) == null) {
         return false;
       }
     } catch(Exception e) {
@@ -1010,8 +1014,7 @@ public static boolean isSecureZooKeeper(Configuration conf) {
     }
 
     // Master & RSs uses hbase.zookeeper.client.*
-    return("kerberos".equalsIgnoreCase(conf.get("hbase.security.authentication")) &&
-         conf.get("hbase.zookeeper.client.keytab.file") != null);
+    return("kerberos".equalsIgnoreCase(conf.get("hbase.security.authentication")));
   }
 
   private static ArrayList<ACL> createACL(ZooKeeperWatcher zkw, String node) {