From 6579e9cee2e25d638a8488e4a47db4bc3aaea126 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 15 Oct 2008 04:05:18 +0000
Subject: [PATCH] Fix for issue 3516 (dsconfig --displayCommand issue)
---
opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index 6599232..d3ee4ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -978,7 +978,8 @@
truststore.load(null, null);
}
- if (secureArgsList.trustStorePasswordFileArg.isPresent())
+ if (secureArgsList.trustStorePasswordFileArg.isPresent() &&
+ (truststorePath != null))
{
copySecureArgsList.trustStorePasswordFileArg.clearValues();
copySecureArgsList.trustStorePasswordFileArg.getNameToValueMap().putAll(
@@ -986,8 +987,10 @@
commandBuilder.addArgument(
copySecureArgsList.trustStorePasswordFileArg);
}
- else
+ else if ((truststorePassword != null) && (truststorePath != null))
{
+ // Only add the trust store password if there is one AND if the user
+ // specified a trust store path.
copySecureArgsList.trustStorePasswordArg.clearValues();
copySecureArgsList.trustStorePasswordArg.addValue(truststorePassword);
commandBuilder.addObfuscatedArgument(
@@ -1213,7 +1216,7 @@
commandBuilder.addArgument(
copySecureArgsList.keyStorePasswordFileArg);
}
- else
+ else if (keystorePassword != null)
{
copySecureArgsList.keyStorePasswordArg.clearValues();
copySecureArgsList.keyStorePasswordArg.addValue(keystorePassword);
--
Gitblit v1.10.0