From e3c58b5ae8627aa944240605f5f0451c4428f85e Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 03 Sep 2007 14:35:07 +0000
Subject: [PATCH] Fix a bug with certificates in the uninstaller and replication command lines. Improve the error messages to be displayed to the user when the uninstall fails.Fix a infinite loop that occurred when the user provided a protocol not configured in the server to access the registration information. Fix a bug that prevented the uninstall to proceed when the user specified forceOnError and an error accessing the remote servers configuration occurred. Fix a bug that occurred when the user specified to use start TLS and it was not configured in the server (this bug applies to both the uninstaller and status command-lines).
---
opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
index 5276892..b5e810a 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusCli.java
@@ -382,6 +382,7 @@
LOG.log(Level.WARNING, "Error reading config file: "+ce, ce);
printLineBreak();
printErrorMessage(ERR_COULD_NOT_FIND_VALID_LDAPURL.get());
+ printLineBreak();
useSSL = confirm(INFO_CLI_USESSL_PROMPT.get(), useSSL);
if (!useSSL)
{
@@ -399,7 +400,7 @@
String usedUrl = ConnectionUtils.getLDAPUrl(host, port,
useSSL);
if (!promptForCertificateConfirmation(ne, getTrustManager(),
- usedUrl))
+ usedUrl, getTrustManager()))
{
cancelled = true;
}
@@ -1209,31 +1210,4 @@
{
return argParser.getTrustManager();
}
-
- /**
- * Returns the ConnectionPolicy to be used with the parameters provided
- * by the user.
- * @param useSSL whether the user asked to use SSL or not.
- * @param useStartTLS whether the user asked to use Start TLS or not.
- * @return the ConnectionPolicy to be used with the parameters provided
- * by the user.
- */
- private ConnectionProtocolPolicy getConnectionPolicy(boolean useSSL,
- boolean useStartTLS)
- {
- ConnectionProtocolPolicy policy;
- if (useStartTLS)
- {
- policy = ConnectionProtocolPolicy.USE_STARTTLS;
- }
- if (useSSL)
- {
- policy = ConnectionProtocolPolicy.USE_LDAPS;
- }
- else
- {
- policy = ConnectionProtocolPolicy.USE_LESS_SECURE_AVAILABLE;
- }
- return policy;
- }
}
--
Gitblit v1.10.0