From a8e90dc24cfad67ba20bd03d33472544f98b2d5d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 16 Nov 2007 14:57:13 +0000
Subject: [PATCH] Fix a bug that asked for the administrator password in interactive mode even if the user already provided it.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
index 8d537f3..198c5b8 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
@@ -671,7 +671,7 @@
adminUid = ci.getProvidedAdminUID();
if (ci.getProvidedBindDN() == null)
{
- // If the explicitit bind DN is not null, the password corresponds
+ // If the explicit bind DN is not null, the password corresponds
// to that bind DN. We are in the case where the user provides
// bind DN on first server and admin UID globally.
adminPwd = ci.getBindPassword();
@@ -839,7 +839,13 @@
if (ci.getProvidedAdminUID() != null)
{
adminUid = ci.getProvidedAdminUID();
- adminPwd = ci.getBindPassword();
+ if (ci.getProvidedBindDN() == null)
+ {
+ // If the explicit bind DN is not null, the password corresponds
+ // to that bind DN. We are in the case where the user provides
+ // bind DN on first server and admin UID globally.
+ adminPwd = ci.getBindPassword();
+ }
}
bindDn2 = ci.getBindDN();
pwd2 = ci.getBindPassword();
@@ -1000,6 +1006,10 @@
uData.setAdminUid(adminUid);
}
+ if (uData.getAdminPwd() == null)
+ {
+ uData.setAdminPwd(adminPwd);
+ }
if (!cancelled && (uData.getAdminPwd() == null) && !administratorDefined)
{
adminPwd = null;
--
Gitblit v1.10.0