You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2018/11/27 20:04:37 UTC
zookeeper git commit: ZOOKEEPER-3194: Quorum TLS - fix copy/paste bug
in ZKTrustManager
Repository: zookeeper
Updated Branches:
refs/heads/master 64104eaea -> a109b8b50
ZOOKEEPER-3194: Quorum TLS - fix copy/paste bug in ZKTrustManager
Fix an obvious copy/paste bug. Tested by making sure ZKTrustManagerTest still passes.
Author: Ilya Maykov <il...@fb.com>
Reviewers: andor@apache.org
Closes #709 from ivmaykov/ZOOKEEPER-3194
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/a109b8b5
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/a109b8b5
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/a109b8b5
Branch: refs/heads/master
Commit: a109b8b5034a160c3ad0f4d2b790df962ff4dc47
Parents: 64104ea
Author: Ilya Maykov <il...@fb.com>
Authored: Tue Nov 27 21:04:31 2018 +0100
Committer: Andor Molnar <an...@apache.org>
Committed: Tue Nov 27 21:04:31 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/zookeeper/common/ZKTrustManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a109b8b5/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
----------------------------------------------------------------------
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java b/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
index 73006d0..aa02145 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
@@ -85,7 +85,7 @@ public class ZKTrustManager extends X509ExtendedTrustManager {
@Override
public void checkClientTrusted(X509Certificate[] chain, String authType, SSLEngine engine) throws CertificateException {
- x509ExtendedTrustManager.checkServerTrusted(chain, authType, engine);
+ x509ExtendedTrustManager.checkClientTrusted(chain, authType, engine);
if (clientHostnameVerificationEnabled) {
try {
performHostVerification(InetAddress.getByName(engine.getPeerHost()), chain[0]);