From 4ad2fdaa1e21efab8c6698202036539af2edb79f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 19 Nov 2008 02:29:22 +0000
Subject: [PATCH] Fix for issue 3624 (Equivalent command-line of 'Reset User Password' should be ldappasswordmodify instead of ldapmodify)

---
 opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
index aa89ad1..4714edd 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
@@ -55,6 +55,7 @@
 import org.opends.server.types.DN;
 import org.opends.server.types.OpenDsException;
 import org.opends.server.util.ServerConstants;
+import org.opends.server.util.cli.CommandBuilder;
 
 /**
  * The task called when we want to reset the password of the user.
@@ -210,7 +211,7 @@
       {
         public void run()
         {
-          printEquivalentCommandToModify(dn, modifications, useAdminCtx);
+          printEquivalentCommand(dn, newPassword, useAdminCtx);
           getProgressDialog().appendProgressHtml(
               Utilities.getProgressWithPoints(
                   INFO_CTRL_PANEL_RESETTING_USER_PASSWORD.get(node.getDN()),
@@ -248,4 +249,33 @@
       state = State.FINISHED_WITH_ERROR;
     }
   }
+
+  /**
+   * Prints the equivalent modify command line in the progress dialog.
+   * @param dn the dn of the modified entry.
+   * @param newPassword the new password.
+   * @param useAdminCtx use the administration connector.
+   */
+  private void printEquivalentCommand(DN dn, char[] newPassword,
+      boolean useAdminCtx)
+  {
+    ArrayList<String> args = new ArrayList<String>();
+    args.add(getCommandLinePath("ldappasswordmodify"));
+    args.add("--authzID");
+    args.add("dn:"+dn);
+    args.add("--newPassword");
+    args.add(Utilities.OBFUSCATED_VALUE);
+    args.addAll(getObfuscatedCommandLineArguments(
+        getConnectionCommandLineArguments(useAdminCtx, true)));
+    args.add(getNoPropertiesFileArgument());
+    StringBuilder sb = new StringBuilder();
+    for (String arg : args)
+    {
+      sb.append(" "+CommandBuilder.escapeValue(arg));
+    }
+    getProgressDialog().appendProgressHtml(Utilities.applyFont(
+        INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_RESET_PASSWORD.get().toString()+
+        "<br><b>"+sb.toString()+"</b><br><br>",
+        ColorAndFontConstants.progressFont));
+  }
 }

--
Gitblit v1.10.0