From 2406449c5f0309525bfd5d86de417b32bcc7c1b3 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).
---
opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java b/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
index c69bab0..c5919e4 100644
--- a/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
+++ b/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
@@ -519,7 +519,8 @@
if (Utils.isCertificateException(ne))
{
String usedUrl = ConnectionUtils.getLDAPUrl(host1, port1, useSSL1);
- if (!promptForCertificateConfirmation(ne, getTrustManager(), usedUrl))
+ if (!promptForCertificateConfirmation(ne, getTrustManager(), usedUrl,
+ getTrustManager()))
{
cancelled = true;
}
@@ -716,7 +717,8 @@
if (Utils.isCertificateException(ne))
{
String usedUrl = ConnectionUtils.getLDAPUrl(host2, port2, useSSL2);
- if (!promptForCertificateConfirmation(ne, getTrustManager(), usedUrl))
+ if (!promptForCertificateConfirmation(ne, getTrustManager(), usedUrl,
+ getTrustManager()))
{
cancelled = true;
}
@@ -993,7 +995,8 @@
if (Utils.isCertificateException(ne))
{
String usedUrl = ConnectionUtils.getLDAPUrl(host, port, useSSL);
- if (!promptForCertificateConfirmation(ne, getTrustManager(), usedUrl))
+ if (!promptForCertificateConfirmation(ne, getTrustManager(), usedUrl,
+ getTrustManager()))
{
cancelled = true;
}
@@ -1171,7 +1174,8 @@
{
String usedUrl = ConnectionUtils.getLDAPUrl(hostSource, portSource,
useSSLSource);
- if (!promptForCertificateConfirmation(ne, getTrustManager(), usedUrl))
+ if (!promptForCertificateConfirmation(ne, getTrustManager(), usedUrl,
+ getTrustManager()))
{
cancelled = true;
}
@@ -1271,7 +1275,8 @@
{
String usedUrl = ConnectionUtils.getLDAPUrl(hostDestination,
portDestination, useSSLDestination);
- if (!promptForCertificateConfirmation(ne, getTrustManager(), usedUrl))
+ if (!promptForCertificateConfirmation(ne, getTrustManager(), usedUrl,
+ getTrustManager()))
{
cancelled = true;
}
@@ -1737,7 +1742,7 @@
{
reloadTopology = true;
cancelled = !promptForCertificateConfirmation(e.getCause(),
- getTrustManager(), e.getLdapUrl());
+ e.getTrustManager(), e.getLdapUrl(), e.getTrustManager());
}
else
{
--
Gitblit v1.10.0