hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject [10/22] git commit: HADOOP-10868. Addendum
Date Wed, 17 Sep 2014 00:59:05 GMT
HADOOP-10868. Addendum


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7e08c0f2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7e08c0f2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7e08c0f2

Branch: refs/heads/HDFS-6584
Commit: 7e08c0f23f58aa143f0997f2472e8051175142e9
Parents: 932ae03
Author: Alejandro Abdelnur <tucu@apache.org>
Authored: Mon Sep 15 19:39:27 2014 -0700
Committer: Alejandro Abdelnur <tucu@apache.org>
Committed: Mon Sep 15 19:39:27 2014 -0700

----------------------------------------------------------------------
 .../security/authentication/util/ZKSignerSecretProvider.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e08c0f2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java
index 45d4d65..a17b6d4 100644
--- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java
+++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java
@@ -139,6 +139,9 @@ public class ZKSignerSecretProvider extends RolloverSignerSecretProvider
{
       ZOOKEEPER_SIGNER_SECRET_PROVIDER_CURATOR_CLIENT_ATTRIBUTE =
       CONFIG_PREFIX + "curator.client";
 
+  private static final String JAAS_LOGIN_ENTRY_NAME =
+          "ZKSignerSecretProviderClient";
+
   private static Logger LOG = LoggerFactory.getLogger(
           ZKSignerSecretProvider.class);
   private String path;
@@ -384,7 +387,7 @@ public class ZKSignerSecretProvider extends RolloverSignerSecretProvider
{
               + "and using 'sasl' ACLs");
       String principal = setJaasConfiguration(config);
       System.setProperty(ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY,
-              "ZKSignerSecretProviderClient");
+              JAAS_LOGIN_ENTRY_NAME);
       System.setProperty("zookeeper.authProvider.1",
               "org.apache.zookeeper.server.auth.SASLAuthenticationProvider");
       aclProvider = new SASLOwnerACLProvider(principal);
@@ -417,7 +420,7 @@ public class ZKSignerSecretProvider extends RolloverSignerSecretProvider
{
     // This is equivalent to writing a jaas.conf file and setting the system
     // property, "java.security.auth.login.config", to point to it
     JaasConfiguration jConf =
-            new JaasConfiguration("Client", principal, keytabFile);
+            new JaasConfiguration(JAAS_LOGIN_ENTRY_NAME, principal, keytabFile);
     Configuration.setConfiguration(jConf);
     return principal.split("[/@]")[0];
   }


Mime
View raw message