This is an automated email from the ASF dual-hosted git repository.
xyao pushed a commit to branch ozone-0.4.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/ozone-0.4.1 by this push:
new 0b92dec HDDS-1858. mTLS support for Ozone is not correct. Contributed
by Siddharth Wagle.
0b92dec is described below
commit 0b92dec7f0ad99d937b5ff56a4a0a3bd629c05be
Author: Xiaoyu Yao <[email protected]>
AuthorDate: Thu Jul 25 09:52:02 2019 -0700
HDDS-1858. mTLS support for Ozone is not correct. Contributed by Siddharth
Wagle.
(cherry picked from commit b41ef61ebcc8a7ab5449390756b6361ea918a79c)
---
hadoop-hdds/common/src/main/java/org/apache/ratis/RatisHelper.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hadoop-hdds/common/src/main/java/org/apache/ratis/RatisHelper.java
b/hadoop-hdds/common/src/main/java/org/apache/ratis/RatisHelper.java
index a63d18a..557815b 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/ratis/RatisHelper.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/ratis/RatisHelper.java
@@ -202,11 +202,11 @@ public interface RatisHelper {
static GrpcTlsConfig createTlsClientConfig(SecurityConfig conf) {
if (conf.isGrpcTlsEnabled()) {
if (conf.isGrpcMutualTlsRequired()) {
- return new GrpcTlsConfig(
- null, null, conf.getTrustStoreFile(), false);
- } else {
return new GrpcTlsConfig(conf.getClientPrivateKeyFile(),
conf.getClientCertChainFile(), conf.getTrustStoreFile(), true);
+ } else {
+ return new GrpcTlsConfig(
+ null, null, conf.getTrustStoreFile(), false);
}
}
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
