From 23ca52ebddf3bdda34bf0089defdf2efd0949950 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 25 Mar 2009 10:32:39 +0000
Subject: [PATCH] Fix for issue 3297 (English answer hardcoded in tools.properties) Use localized strings to check the answer provided by the user. Be more permisive and make a non-case sensitive check of the user's answer (so know Yes is accepted).
---
opends/src/server/org/opends/server/tools/PromptTrustManager.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/PromptTrustManager.java b/opends/src/server/org/opends/server/tools/PromptTrustManager.java
index e58dc8d..014c7e8 100644
--- a/opends/src/server/org/opends/server/tools/PromptTrustManager.java
+++ b/opends/src/server/org/opends/server/tools/PromptTrustManager.java
@@ -163,13 +163,19 @@
{
System.out.print(prompt);
String line = reader.readLine().toLowerCase();
- if (line.equals("y") || line.equals("yes"))
+ if (line.equalsIgnoreCase(
+ INFO_PROMPT_YES_COMPLETE_ANSWER.get().toString()) ||
+ line.equalsIgnoreCase(
+ INFO_PROMPT_YES_FIRST_LETTER_ANSWER.get().toString()))
{
// Returning without an exception is sufficient to consider the
// certificate trusted.
return;
}
- else if (line.equals("n") || line.equals("no"))
+ if (line.equalsIgnoreCase(
+ INFO_PROMPT_NO_COMPLETE_ANSWER.get().toString()) ||
+ line.equalsIgnoreCase(
+ INFO_PROMPT_NO_FIRST_LETTER_ANSWER.get().toString()))
{
Message message = ERR_PROMPTTM_USER_REJECTED.get();
throw new CertificateException(message.toString());
--
Gitblit v1.10.0