From 7f750fe61235f55941bd7849725b49ab29eb1d6c Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Fri, 29 Jun 2007 18:05:08 +0000
Subject: [PATCH] Fixed SSL configuration files for the functional tests for Issue 1680.

---
 opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif           |    2 +-
 opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif      |    2 +-
 opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif |    5 +----
 opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_ldaps_conn_handler.ldif   |    2 +-
 opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif   |    5 +----
 opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif      |    5 +----
 6 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif
index 8edf977..b01296c 100644
--- a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif
+++ b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_ldaps_conn_handler.ldif
@@ -1,7 +1,7 @@
 dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
 changetype: modify
 replace: ds-cfg-trust-manager-provider-dn
-ds-cfg-trust-manager-provider-dn: cn=JKS,cn=Trust Manager Providers,cn=config
+ds-cfg-trust-manager-provider-dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config
 -
 replace: ds-cfg-key-manager-provider-dn
 ds-cfg-key-manager-provider-dn: cn=JKS,cn=Key Manager Providers,cn=config
diff --git a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif
index 901e9c6..8612090 100644
--- a/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif
+++ b/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif
@@ -23,11 +23,8 @@
 #      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
-dn: cn=JKS,cn=Trust Manager Providers,cn=config
+dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config
 changetype: modify
-replace: ds-cfg-trust-manager-provider-class
-ds-cfg-trust-manager-provider-class: org.opends.server.extensions.BlindTrustManagerProvider
--
 replace: ds-cfg-trust-manager-provider-enabled
 ds-cfg-trust-manager-provider-enabled: true
 
diff --git a/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_ldaps_conn_handler.ldif b/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_ldaps_conn_handler.ldif
index e7b4d4e..3c5ad17 100755
--- a/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_ldaps_conn_handler.ldif
+++ b/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_ldaps_conn_handler.ldif
@@ -1,7 +1,7 @@
 dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
 changetype: modify
 replace: ds-cfg-trust-manager-provider-dn
-ds-cfg-trust-manager-provider-dn: cn=PKCS12,cn=Trust Manager Providers,cn=config
+ds-cfg-trust-manager-provider-dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config
 -
 replace: ds-cfg-key-manager-provider-dn
 ds-cfg-key-manager-provider-dn: cn=PKCS12,cn=Key Manager Providers,cn=config
diff --git a/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif b/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif
index 0a149f6..8612090 100755
--- a/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif
+++ b/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif
@@ -23,11 +23,8 @@
 #      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
-dn: cn=PKCS12,cn=Trust Manager Providers,cn=config
+dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config
 changetype: modify
-replace: ds-cfg-trust-manager-provider-class
-ds-cfg-trust-manager-provider-class: org.opends.server.extensions.BlindTrustManagerProvider
--
 replace: ds-cfg-trust-manager-provider-enabled
 ds-cfg-trust-manager-provider-enabled: true
 
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif b/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif
index 5ae2ef8..a9ba030 100644
--- a/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif
+++ b/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif
@@ -29,7 +29,7 @@
 ds-cfg-allow-start-tls: true
 -
 replace: ds-cfg-trust-manager-provider-dn
-ds-cfg-trust-manager-provider-dn: cn=JKS,cn=Trust Manager Providers,cn=config
+ds-cfg-trust-manager-provider-dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config
 -
 replace: ds-cfg-key-manager-provider-dn
 ds-cfg-key-manager-provider-dn: cn=JKS,cn=Key Manager Providers,cn=config
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif b/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif
index 901e9c6..8612090 100644
--- a/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif
+++ b/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif
@@ -23,11 +23,8 @@
 #      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
-dn: cn=JKS,cn=Trust Manager Providers,cn=config
+dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config
 changetype: modify
-replace: ds-cfg-trust-manager-provider-class
-ds-cfg-trust-manager-provider-class: org.opends.server.extensions.BlindTrustManagerProvider
--
 replace: ds-cfg-trust-manager-provider-enabled
 ds-cfg-trust-manager-provider-enabled: true
 

--
Gitblit v1.10.0