From d9b2b9b7578edb367174b1a516f38feb6eb028ae Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 10 Nov 2006 23:45:06 +0000
Subject: [PATCH] Make a number of changes to administrative tools provided with OpenDS.  These are all made under the umbrella of issue #994, but there are individual issues for each change.

---
 opends/src/server/org/opends/server/tools/LDAPPasswordModify.java |   31 +++++++++++++------------------
 1 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
index bff98ee..289ff11 100644
--- a/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -85,13 +85,6 @@
 
 
 
-  /**
-   * The position at which to wrap long lines.
-   */
-  public static final int MAX_LINE_WIDTH = 79;
-
-
-
 
   /**
    * Parses the command-line arguments, establishes a connection to the
@@ -190,7 +183,9 @@
 
 
     // Initialize the argument parser.
-    ArgumentParser argParser = new ArgumentParser(CLASS_NAME, false);
+    String toolDescription = getMessage(MSGID_LDAPPWMOD_TOOL_DESCRIPTION);
+    ArgumentParser argParser = new ArgumentParser(CLASS_NAME, toolDescription,
+                                                  false);
 
     try
     {
@@ -206,6 +201,16 @@
       argParser.addArgument(ldapPort);
 
 
+      useSSL = new BooleanArgument("usessl", 'Z', "useSSL",
+                                   MSGID_LDAPPWMOD_DESCRIPTION_USE_SSL);
+      argParser.addArgument(useSSL);
+
+
+      useStartTLS = new BooleanArgument("usestarttls", 'q', "useStartTLS",
+                             MSGID_LDAPPWMOD_DESCRIPTION_USE_STARTTLS);
+      argParser.addArgument(useStartTLS);
+
+
       bindDN = new StringArgument("binddn", 'D', "bindDN", false, false, true,
                                   "{bindDN}", null, null,
                                   MSGID_LDAPPWMOD_DESCRIPTION_BIND_DN);
@@ -263,16 +268,6 @@
       argParser.addArgument(currentPWFile);
 
 
-      useSSL = new BooleanArgument("usessl", 'Z', "useSSL",
-                                   MSGID_LDAPPWMOD_DESCRIPTION_USE_SSL);
-      argParser.addArgument(useSSL);
-
-
-      useStartTLS = new BooleanArgument("usestarttls", 'q', "useStartTLS",
-                             MSGID_LDAPPWMOD_DESCRIPTION_USE_STARTTLS);
-      argParser.addArgument(useStartTLS);
-
-
       sslBlindTrust =
            new BooleanArgument("blindtrust", 'X', "trustAllCertificates",
                                MSGID_LDAPPWMOD_DESCRIPTION_BLIND_TRUST);

--
Gitblit v1.10.0