From 60f5dfd7eaa64aa931033c0e5266391ecbbc96fa Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 25 Sep 2013 07:31:13 +0000
Subject: [PATCH] Fix OPENDJ-18 - keystore import failes due to empty PIN Review CR-2353
---
opends/src/admin/defn/org/opends/server/admin/std/FileBasedKeyManagerProviderConfiguration.xml | 20 +-------------------
1 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/FileBasedKeyManagerProviderConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/FileBasedKeyManagerProviderConfiguration.xml
index 9a9b483..c0cb8fb 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/FileBasedKeyManagerProviderConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/FileBasedKeyManagerProviderConfiguration.xml
@@ -24,6 +24,7 @@
!
!
! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Portions Copyright 2013 ForgeRock AS
! -->
<adm:managed-object name="file-based-key-manager-provider"
plural-name="file-based-key-manager-providers"
@@ -40,25 +41,6 @@
Multiple file formats may be supported, depending on the providers
supported by the underlying Java runtime environment.
</adm:description>
- <adm:constraint>
- <adm:synopsis>
- The key store pin must be specified using one of the key-store-pin
- properties when the
- <adm:user-friendly-name />
- is enabled.
- </adm:synopsis>
- <adm:condition>
- <adm:implies>
- <adm:contains property="enabled" value="true" />
- <adm:or>
- <adm:is-present property="key-store-pin-property" />
- <adm:is-present property="key-store-pin-environment-variable" />
- <adm:is-present property="key-store-pin-file" />
- <adm:is-present property="key-store-pin" />
- </adm:or>
- </adm:implies>
- </adm:condition>
- </adm:constraint>
<adm:profile name="ldap">
<ldap:object-class>
<ldap:name>ds-cfg-file-based-key-manager-provider</ldap:name>
--
Gitblit v1.10.0