From 5606f48359e5d381e80bc7bf8f42bcbdf2e19ec0 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 11 Jul 2007 05:32:57 +0000
Subject: [PATCH] Make a few generic fixes to various configuration classes, including:
---
opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index 5e5308f..54a8616 100644
--- a/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -294,7 +294,7 @@
List<String> unacceptableReasons)
{
boolean configAcceptable = true;
- DN configEntryDN = configuration.dn();
+ DN cfgEntryDN = configuration.dn();
// Get the PIN needed to access the contents of the keystore file.
@@ -317,7 +317,7 @@
{
int msgID = MSGID_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET;
unacceptableReasons.add(getMessage(msgID, String.valueOf(propertyName),
- String.valueOf(configEntryDN)));
+ String.valueOf(cfgEntryDN)));
configAcceptable = false;
}
}
@@ -330,7 +330,7 @@
{
int msgID = MSGID_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET;
unacceptableReasons.add(getMessage(msgID, String.valueOf(enVarName),
- String.valueOf(configEntryDN)));
+ String.valueOf(cfgEntryDN)));
configAcceptable = false;
}
}
@@ -343,7 +343,7 @@
{
int msgID = MSGID_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE;
unacceptableReasons.add(getMessage(msgID, String.valueOf(fileName),
- String.valueOf(configEntryDN)));
+ String.valueOf(cfgEntryDN)));
configAcceptable = false;
}
else
@@ -358,7 +358,7 @@
{
int msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ;
unacceptableReasons.add(getMessage(msgID, String.valueOf(fileName),
- String.valueOf(configEntryDN),
+ String.valueOf(cfgEntryDN),
getExceptionMessage(ioe)));
configAcceptable = false;
}
@@ -374,7 +374,7 @@
{
int msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_EMPTY;
unacceptableReasons.add(getMessage(msgID, String.valueOf(fileName),
- String.valueOf(configEntryDN)));
+ String.valueOf(cfgEntryDN)));
configAcceptable = false;
}
}
@@ -387,7 +387,7 @@
{
// Pin wasn't defined anywhere.
int msgID = MSGID_PKCS11_KEYMANAGER_NO_PIN;
- unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN)));
+ unacceptableReasons.add(getMessage(msgID, String.valueOf(cfgEntryDN)));
configAcceptable = false;
}
--
Gitblit v1.10.0