From ed803f46487547b3134c8fd58b12916372556878 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 08 Apr 2008 11:07:16 +0000
Subject: [PATCH] Fix for issue 3129 (stop-ds: -j/--bindPasswordFile option doesn't work) In fact the issue applies to most of the task based command-lines (like export-ldif or import-ldif).  THe fix consist basically on taking into account whether the user provided the password in a file or not.

---
 opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
index 02374c1..3b4fc00 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
@@ -65,6 +65,7 @@
 import org.opends.server.util.args.BooleanArgument;
 import org.opends.server.util.args.FileBasedArgument;
 import org.opends.server.util.args.IntegerArgument;
+import org.opends.server.util.args.LDAPConnectionArgumentParser;
 import org.opends.server.util.args.StringArgument;
 
 import static org.opends.server.config.ConfigConstants.*;
@@ -654,8 +655,9 @@
     {
       connection = new LDAPConnection(host.getValue(), port.getIntValue(),
                                       connectionOptions, out, err);
-      connection.connectToHost(bindDN.getValue(), bindPW.getValue(),
-                               nextMessageID);
+      connection.connectToHost(bindDN.getValue(),
+          LDAPConnectionArgumentParser.getPasswordValue(bindPW, bindPWFile),
+          nextMessageID);
     }
     catch (ArgumentException ae)
     {

--
Gitblit v1.10.0