From 5d0ceeba98f7bfd2cf17a1f2970e4c8be3130388 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Sun, 26 Aug 2007 17:43:55 +0000
Subject: [PATCH] Fix for issues 2104 and 2162.
---
opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index e1e4d3a..ac26dcc 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -78,6 +78,14 @@
private UninstallerArgumentParser parser;
/**
+ * Default constructor.
+ */
+ public UninstallCliHelper()
+ {
+ super(System.out, System.err, System.in);
+ }
+
+ /**
* Creates a UserData based in the arguments provided. It asks
* user for additional information if what is provided in the arguments is not
* enough.
@@ -620,21 +628,21 @@
try
{
String dn = ADSContext.getAdministratorDN(uid);
- if ((ldapsUrl != null) && (parser.useSSL() || !parser.startTLS()))
+ if ((ldapsUrl != null) && (parser.useSSL() || !parser.useStartTLS()))
{
usedUrl = ldapsUrl;
ctx = Utils.createLdapsContext(ldapsUrl, dn, pwd,
Utils.getDefaultLDAPTimeout(), null, userData.getTrustManager());
}
else if ((startTlsUrl != null) &&
- (!parser.useSSL() || parser.startTLS()))
+ (!parser.useSSL() || parser.useStartTLS()))
{
usedUrl = startTlsUrl;
ctx = Utils.createStartTLSContext(startTlsUrl, dn, pwd,
Utils.getDefaultLDAPTimeout(), null, userData.getTrustManager(),
null);
}
- else if ((ldapUrl != null) && !parser.useSSL() && !parser.startTLS())
+ else if ((ldapUrl != null) && !parser.useSSL() && !parser.useStartTLS())
{
usedUrl = ldapUrl;
ctx = Utils.createLdapContext(ldapUrl, dn, pwd,
@@ -838,19 +846,19 @@
String adminUid = userData.getAdminUID();
String pwd = userData.getAdminPwd();
String dn = ADSContext.getAdministratorDN(adminUid);
- if ((ldapsUrl != null) && (parser.useSSL() || !parser.startTLS()))
+ if ((ldapsUrl != null) && (parser.useSSL() || !parser.useStartTLS()))
{
ctx = Utils.createLdapsContext(ldapsUrl, dn, pwd,
Utils.getDefaultLDAPTimeout(), null, userData.getTrustManager());
}
else if ((startTlsUrl != null) &&
- (!parser.useSSL() || parser.startTLS()))
+ (!parser.useSSL() || parser.useStartTLS()))
{
ctx = Utils.createStartTLSContext(startTlsUrl, dn, pwd,
Utils.getDefaultLDAPTimeout(), null, userData.getTrustManager(),
null);
}
- else if ((ldapUrl != null) && !parser.useSSL() && !parser.startTLS())
+ else if ((ldapUrl != null) && !parser.useSSL() && !parser.useStartTLS())
{
ctx = Utils.createLdapContext(ldapUrl, dn, pwd,
Utils.getDefaultLDAPTimeout(), null);
--
Gitblit v1.10.0