From f3e3cc3a3ee4086856eb2336e21cd8fb62dcc0a3 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 06 Sep 2007 14:24:48 +0000
Subject: [PATCH] fix for entity truststore (interactive mode)
---
opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java b/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
index 210df46..38846af 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
@@ -660,7 +660,11 @@
String ninput = input.trim();
if (ninput.length() == 0)
{
- return ninput;
+ app.println();
+ app.println(ERR_DSCFG_PROMPT_SECURITY_INVALID_FILE_PATH
+ .get());
+ app.println();
+ return null;
}
File f = new File(ninput);
if (f.exists() && f.canRead() && !f.isDirectory())
@@ -702,11 +706,7 @@
truststorePassword = secureArgsList.trustStorePasswordFileArg
.getValue();
}
- if (truststorePassword == null)
- {
- return null;
- }
- else if (truststorePassword.equals("-"))
+ if ((truststorePassword != null) && (truststorePassword.equals("-")))
{
// Read the password from the stdin.
if (!app.isInteractive())
--
Gitblit v1.10.0