From a4cabaa3e40ba18a9eb80bff2a57feed3e25e20e Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 18 Nov 2009 22:52:26 +0000
Subject: [PATCH] Fix for issue 4295 (Issues with dsreplication interactive mode) The following changes complete the previous fix done for this bug, if we were using dsreplication enable on the installation of one of the servers, the interactive mode failed if the option --trustAll was NOT specified.
---
opendj-sdk/opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 7c70f19..665cbaa 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
@@ -94,7 +94,7 @@
// the Console application
private ConsoleApplication app;
- // Indicate if the truststore in in memory
+ // Indicate if the trust store in in memory
private boolean trustStoreInMemory = false;
// Indicate if the all certificates are accepted
@@ -103,7 +103,7 @@
// Indicate that the trust manager was created with the parameters provided
private boolean trustManagerInitialized;
- // The truststore to use for the SSL or STARTTLS connection
+ // The trust store to use for the SSL or STARTTLS connection
private KeyStore truststore;
private String keystorePath;
@@ -835,8 +835,8 @@
trustAll = secureArgsList.trustAllArg.isPresent();
- // Try to use the local instance trustore, to avoid certifacte validation
- // when both the CLI and the server are in the same instance.
+ // Try to use the local instance trust store, to avoid certificate
+ // validation when both the CLI and the server are in the same instance.
if (weDontKnowTheTrustMethod) {
if (addLocalTrustStore()) {
weDontKnowTheTrustMethod = false;
@@ -883,7 +883,7 @@
else if (result.getValue().equals(
TrustMethod.TRUSTSTORE.getChoice()))
{
- // We have to ask for truststore info
+ // We have to ask for trust store info
askForTrustStore = true;
}
else if (result.getValue().equals(
@@ -917,7 +917,7 @@
}
// If we do not trust all server certificates, we have to get info
- // about truststore. First get the truststore path.
+ // about trust store. First get the trust store path.
truststorePath = secureArgsList.trustStorePathArg.getValue();
if (app.isInteractive() && !secureArgsList.trustStorePathArg.isPresent()
@@ -1438,9 +1438,9 @@
}
/**
- * Indicate if the truststore is in memory.
+ * Indicate if the trust store is in memory.
*
- * @return true if the truststore is in memory.
+ * @return true if the trust store is in memory.
*/
public boolean isTrustStoreInMemory() {
return this.trustStoreInMemory;
@@ -1933,7 +1933,7 @@
/**
* Resets the trust manager, so that next time we call the run() method
- * the trust manager takes into account the local truststore.
+ * the trust manager takes into account the local trust store.
*/
public void resetTrustManager()
{
@@ -2043,7 +2043,7 @@
private void initializeTrustManager() throws ArgumentException
{
- // Get truststore info
+ // Get trust store info
trustManager = getTrustManagerInternal();
// Check if we need client side authentication
@@ -2076,7 +2076,7 @@
/**
* Add the TrustStore of the administration connector of the local instance.
*
- * @return true if the local trustore has been added.
+ * @return true if the local trust store has been added.
*/
private boolean addLocalTrustStore()
{
--
Gitblit v1.10.0