From c465af5b01eb04b869326e58bdb3495830dcbb8f Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 01 Mar 2016 09:43:19 +0000
Subject: [PATCH] Fix bug in dsreplication and uninstall cli
---
opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index 2f737af..d567cf1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -619,9 +619,9 @@
// Get the LDAP bind credentials.
state.bindDN = secureArgsList.bindDnArg.getValue();
- state.adminUID= secureArgsList.adminUidHiddenArg.getValue();
+ state.adminUID= secureArgsList.adminUidArg.getValue();
final boolean useAdmin = secureArgsList.useAdminUID();
- if (useAdmin && secureArgsList.adminUidHiddenArg.isPresent())
+ if (useAdmin && secureArgsList.adminUidArg.isPresent())
{
state.providedAdminUID = state.adminUID;
}
@@ -726,9 +726,9 @@
}
if (addAdmin)
{
- copySecureArgsList.adminUidHiddenArg.clearValues();
- copySecureArgsList.adminUidHiddenArg.addValue(getAdministratorUID());
- commandBuilder.addArgument(copySecureArgsList.adminUidHiddenArg);
+ copySecureArgsList.adminUidArg.clearValues();
+ copySecureArgsList.adminUidArg.addValue(getAdministratorUID());
+ commandBuilder.addArgument(copySecureArgsList.adminUidArg);
}
else if (addBindDN)
{
@@ -739,9 +739,9 @@
}
else if (useAdmin)
{
- copySecureArgsList.adminUidHiddenArg.clearValues();
- copySecureArgsList.adminUidHiddenArg.addValue(getAdministratorUID());
- commandBuilder.addArgument(copySecureArgsList.adminUidHiddenArg);
+ copySecureArgsList.adminUidArg.clearValues();
+ copySecureArgsList.adminUidArg.addValue(getAdministratorUID());
+ commandBuilder.addArgument(copySecureArgsList.adminUidArg);
}
else
{
@@ -1967,8 +1967,8 @@
secureArgsList.useStartTLSArg.setPresent(state.useStartTLS);
if (adminUid != null)
{
- secureArgsList.adminUidHiddenArg.addValue(adminUid);
- secureArgsList.adminUidHiddenArg.setPresent(true);
+ secureArgsList.adminUidArg.addValue(adminUid);
+ secureArgsList.adminUidArg.setPresent(true);
}
if (bindDn != null)
{
@@ -2014,8 +2014,8 @@
secureArgsList.bindPasswordFileArg.getNameToValueMap().clear();
secureArgsList.bindPasswordFileArg.setPresent(false);
state.bindPassword = null;
- secureArgsList.adminUidHiddenArg.clearValues();
- secureArgsList.adminUidHiddenArg.setPresent(false);
+ secureArgsList.adminUidArg.clearValues();
+ secureArgsList.adminUidArg.setPresent(false);
}
private void initializeTrustManager() throws ArgumentException
--
Gitblit v1.10.0