[zookeeper] branch branch-3.5 updated: ZOOKEEPER-3590: Zookeeper is unable to set the zookeeper.sasl.client.canonicalize.hostname using system property

[andor]

This is an automated email from the ASF dual-hosted git repository.

andor pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.5 by this push:
     new bd51cb1  ZOOKEEPER-3590: Zookeeper is unable to set the 
zookeeper.sasl.client.canonicalize.hostname using system property
bd51cb1 is described below

commit bd51cb17c1f140c6fdb583331cd2ceecf0bed902
Author: aristotelhs <aristote...@lenses.io>
AuthorDate: Fri Nov 22 23:42:31 2019 +0100

    ZOOKEEPER-3590: Zookeeper is unable to set the 
zookeeper.sasl.client.canonicalize.hostname using system property
    
    See https://issues.apache.org/jira/browse/ZOOKEEPER-3590
    
    This is a very small patch that gives sets the option after reading it from 
the system.getProperty().
    
    There should not be any side effects since this is mostly copy paste.
    
    Author: aristotelhs <aristote...@lenses.io>
    
    Reviewers: eolive...@apache.org, an...@apache.org
    
    Closes #1124 from aristotelhs/ZOOKEEPER-3590
    
    (cherry picked from commit 0b9d30faedd27dec9d03220635467fdb23de6b8b)
    Signed-off-by: Andor Molnar <an...@apache.org>
---
 .../src/main/java/org/apache/zookeeper/client/ZKClientConfig.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZKClientConfig.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZKClientConfig.java
index 07ae65c..1e67172 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZKClientConfig.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZKClientConfig.java
@@ -102,6 +102,7 @@ public class ZKClientConfig extends ZKConfig {
          * backward compatibility for client specific properties
          */
         setProperty(ZK_SASL_CLIENT_USERNAME, 
System.getProperty(ZK_SASL_CLIENT_USERNAME));
+        setProperty(ZK_SASL_CLIENT_CANONICALIZE_HOSTNAME, 
System.getProperty(ZK_SASL_CLIENT_CANONICALIZE_HOSTNAME));
         setProperty(LOGIN_CONTEXT_NAME_KEY, 
System.getProperty(LOGIN_CONTEXT_NAME_KEY));
         setProperty(ENABLE_CLIENT_SASL_KEY, 
System.getProperty(ENABLE_CLIENT_SASL_KEY));
         setProperty(ZOOKEEPER_SERVER_REALM, 
System.getProperty(ZOOKEEPER_SERVER_REALM));