From 2ee035bf164fe1976b7c51b0f248322ae6dcb33e Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Thu, 26 Apr 2007 21:37:38 +0000
Subject: [PATCH] Fix issue 1516: encode-password with --encodedPasswordFile doesn't work.
---
opends/src/server/org/opends/server/tools/EncodePassword.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/EncodePassword.java b/opends/src/server/org/opends/server/tools/EncodePassword.java
index 1fb4f2f..7987633 100644
--- a/opends/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opends/src/server/org/opends/server/tools/EncodePassword.java
@@ -319,7 +319,8 @@
return 1;
}
- if ((! encodedPassword.isPresent()) && (! schemeName.isPresent()))
+ if ((! encodedPassword.isPresent()) && (! encodedPasswordFile.isPresent())
+ && (! schemeName.isPresent()))
{
int msgID = MSGID_ENCPW_NO_SCHEME;
String message = getMessage(msgID, schemeName.getLongIdentifier());
@@ -339,6 +340,11 @@
compareMode = true;
encodedPW = new ASN1OctetString(encodedPassword.getValue());
}
+ else if (encodedPasswordFile.hasValue())
+ {
+ compareMode = true;
+ encodedPW = new ASN1OctetString(encodedPasswordFile.getValue());
+ }
else
{
compareMode = false;
--
Gitblit v1.10.0