From cc1c6f1cdffde42168e05c90c293261fedde8419 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Mon, 19 Feb 2007 14:25:34 +0000
Subject: [PATCH] Resolve issue 1242 configDS should allow params for root DN and password

---
 opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
index d5ac1c8..5431cb8 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
@@ -31,16 +31,16 @@
       This function makes the configuration changes for SSL
     </function-prolog>
     <function-map-args>
-      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+      <function-required-arg name="dsInstanceHost">
         Directory Server Host Name
       </function-required-arg>
-      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+      <function-required-arg name="dsInstancePort">
         Directory Server Port Number
       </function-required-arg>
-      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+      <function-required-arg name="dsInstanceDn">
         Directory Server Manager DN
       </function-required-arg>
-      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+      <function-required-arg name="dsInstancePswd">
         Directory Server Manager Password
       </function-required-arg>
       <function-required-arg name="keystoreType">
@@ -125,16 +125,16 @@
       This function makes the configuration changes for startTLS
     </function-prolog>
     <function-map-args>
-      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+      <function-required-arg name="dsInstanceHost">
           Directory Server Host Name
       </function-required-arg>
-      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+      <function-required-arg name="dsInstancePort">
           Directory Server Port Number
       </function-required-arg>
-      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+      <function-required-arg name="dsInstanceDn">
           Directory Server Manager DN
       </function-required-arg>
-      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+      <function-required-arg name="dsInstancePswd">
           Directory Server Manager Password
       </function-required-arg>
       <function-required-arg name="keystoreType">
@@ -224,16 +224,16 @@
       This function reverses the configuration changes for SSL
     </function-prolog>
     <function-map-args>
-      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+      <function-required-arg name="dsInstanceHost">
         Directory Server Host Name
       </function-required-arg>
-      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+      <function-required-arg name="dsInstancePort">
         Directory Server Port Number
       </function-required-arg>
-      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+      <function-required-arg name="dsInstanceDn">
         Directory Server Manager DN
       </function-required-arg>
-      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+      <function-required-arg name="dsInstancePswd">
         Directory Server Manager Password
       </function-required-arg>
       <function-required-arg name="keystoreType">
@@ -323,16 +323,16 @@
       This function reverses the configuration changes for startTLS
     </function-prolog>
     <function-map-args>
-      <function-required-arg name="dsInstanceHost" default="'%s' % DIRECTORY_INSTANCE_HOST">
+      <function-required-arg name="dsInstanceHost">
         Directory Server Host Name
       </function-required-arg>
-      <function-required-arg name="dsInstancePort" default="'%s' % DIRECTORY_INSTANCE_PORT">
+      <function-required-arg name="dsInstancePort">
         Directory Server Port Number
       </function-required-arg>
-      <function-required-arg name="dsInstanceDn" default="'%s' % DIRECTORY_INSTANCE_DN">
+      <function-required-arg name="dsInstanceDn">
         Directory Server Manager DN
       </function-required-arg>
-      <function-required-arg name="dsInstancePswd" default="'%s' % DIRECTORY_INSTANCE_PSWD">
+      <function-required-arg name="dsInstancePswd">
         Directory Server Manager Password
       </function-required-arg>
       <function-required-arg name="keystoreType">

--
Gitblit v1.10.0