From 36d41eebc3cc0b9656a688976c26bf5f819188c3 Mon Sep 17 00:00:00 2001
From: Yuriy Movchan <Yuriy.Movchan@gmail.com>
Date: Tue, 28 Sep 2021 20:02:43 +0000
Subject: [PATCH] fix: Fix rebuild-index in FIPS mode (#189)

---
 opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java
index b20128b..3bcb272 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java
@@ -166,10 +166,10 @@
         SSLConnectionFactory sslConnectionFactory = new SSLConnectionFactory();
         sslConnectionFactory.init(args.getTrustAllArg().isPresent(),
                                   args.getKeyStorePathArg().getValue(),
-                                  args.getKeyStorePasswordArg().getValue(),
+                                  getFirstArgumentValue(args.getKeyStorePasswordArg(), args.getKeyStorePasswordFileArg()),
                                   clientAlias,
                                   args.getTrustStorePathArg().getValue(),
-                                  args.getTrustStorePasswordArg().getValue());
+                                  getFirstArgumentValue(args.getTrustStorePasswordArg(), args.getTrustStorePasswordFileArg()));
         connectionOptions.setSSLConnectionFactory(sslConnectionFactory);
       }
       catch (SSLConnectionException sce)

--
Gitblit v1.10.0