From cd178f0abd653155b713552bde16a14747d42f43 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 10 Oct 2016 12:28:27 +0000
Subject: [PATCH] OPENDJ-3270 Uninstalling server without bind password now returns usage if the password is needed
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java | 3 ---
opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallCliHelper.java | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
index 5d96bad..5625963 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -96,9 +96,6 @@
final Set<DN> alternateBindDNs = new HashSet<>();
try
{
- DirectoryServer.getInstance().initializeConfiguration();
-
- readSchemaIfNeeded(errors);
readConfig(connectionHandlers, backendDescriptors, alternateBindDNs, errors);
}
catch (final OpenDsException oe)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallCliHelper.java
index 6a2040d..d6e014f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -1051,6 +1051,9 @@
info.setTrustManager(userData.getTrustManager());
info.setConnectionPolicy(ConnectionProtocolPolicy.USE_ADMIN);
info.setConnectTimeout(getConnectTimeout());
+ if (userData.getAdminPwd() == null) {
+ throw new UserDataException(null, LocalizableMessage.raw("No administrator password provided"));
+ }
conn = new ConnectionWrapper(
info.getAdminConnectorHostPort(), connectionType,
getAdministratorDN(userData.getAdminUID()), userData.getAdminPwd(),
--
Gitblit v1.10.0