From 107be3d9186d5cdc000181a41abed56d2ca76252 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 15 Jun 2011 15:02:06 +0000
Subject: [PATCH] Fix OPENDJ-187: ldapsearch tool does not hide the password in the command line
---
opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java | 120 ++---------------------------------------------------------
1 files changed, 5 insertions(+), 115 deletions(-)
diff --git a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
index 84d374b..a6c668a 100644
--- a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
+++ b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
@@ -34,9 +34,6 @@
import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
-import java.io.InputStream;
-import java.io.OutputStream;
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.*;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
@@ -163,132 +160,27 @@
public static void main(final String[] args)
{
- final int retCode = mainModRate(args, System.in, System.out, System.err);
+ final int retCode = new ModRate().run(args);
System.exit(filterExitCode(retCode));
}
- /**
- * Parses the provided command-line arguments and uses that information to run
- * the modrate tool.
- *
- * @param args
- * The command-line arguments provided to this program.
- * @return The error code.
- */
-
- static int mainModRate(final String[] args)
- {
- return mainModRate(args, System.in, System.out, System.err);
- }
-
-
-
- /**
- * Parses the provided command-line arguments and uses that information to run
- * the modrate tool.
- *
- * @param args
- * The command-line arguments provided to this program.
- * @param inStream
- * The input stream to use for standard input, or <CODE>null</CODE>
- * if standard input is not needed.
- * @param outStream
- * The output stream to use for standard output, or <CODE>null</CODE>
- * if standard output is not needed.
- * @param errStream
- * The output stream to use for standard error, or <CODE>null</CODE>
- * if standard error is not needed.
- * @return The error code.
- */
-
- static int mainModRate(final String[] args, final InputStream inStream,
- final OutputStream outStream, final OutputStream errStream)
-
- {
- return new ModRate(inStream, outStream, errStream).run(args);
- }
-
-
-
private BooleanArgument verbose;
private BooleanArgument scriptFriendly;
- private ModRate(final InputStream in, final OutputStream out,
- final OutputStream err)
+ private ModRate()
{
- super(in, out, err);
-
+ // Nothing to do.
}
/**
- * Indicates whether or not the user has requested advanced mode.
- *
- * @return Returns <code>true</code> if the user has requested advanced mode.
- */
- @Override
- public boolean isAdvancedMode()
- {
- return false;
- }
-
-
-
- /**
- * Indicates whether or not the user has requested interactive behavior.
- *
- * @return Returns <code>true</code> if the user has requested interactive
- * behavior.
- */
- @Override
- public boolean isInteractive()
- {
- return false;
- }
-
-
-
- /**
- * Indicates whether or not this console application is running in its
- * menu-driven mode. This can be used to dictate whether output should go to
- * the error stream or not. In addition, it may also dictate whether or not
- * sub-menus should display a cancel option as well as a quit option.
- *
- * @return Returns <code>true</code> if this console application is running in
- * its menu-driven mode.
- */
- @Override
- public boolean isMenuDrivenMode()
- {
- return false;
- }
-
-
-
- /**
- * Indicates whether or not the user has requested quiet output.
- *
- * @return Returns <code>true</code> if the user has requested quiet output.
- */
- @Override
- public boolean isQuiet()
- {
- return false;
- }
-
-
-
- /**
- * Indicates whether or not the user has requested script-friendly output.
- *
- * @return Returns <code>true</code> if the user has requested script-friendly
- * output.
+ * {@inheritDoc}
*/
@Override
public boolean isScriptFriendly()
@@ -299,9 +191,7 @@
/**
- * Indicates whether or not the user has requested verbose output.
- *
- * @return Returns <code>true</code> if the user has requested verbose output.
+ * {@inheritDoc}
*/
@Override
public boolean isVerbose()
--
Gitblit v1.10.0