ITS#5810 support back-null

diff --git a/tests/data/regressions/its4184/slapd.conf b/tests/data/regressions/its4184/slapd.conf
index e44b929825b9e0f8f58928baff9290489fbc2de9..030cc9dd7c6601c1968a2709c0ae70a1bff65c71 100644 (file)
--- a/tests/data/regressions/its4184/slapd.conf
+++ b/tests/data/regressions/its4184/slapd.conf
@@ -38,7 +38,7 @@ database      @BACKEND@
 suffix         "ou=Special,dc=example,dc=com"
 subordinate
 rootdn          "cn=Manager,dc=example,dc=com"
-directory      @TESTDIR@/db.2.a
+#~null~#directory      @TESTDIR@/db.2.a
 
 # Indices to maintain
 #bdb#index             default pres,eq
@@ -52,7 +52,8 @@ database      @BACKEND@
 suffix         "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
-directory      @TESTDIR@/db.1.a
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.1.a
 
 # Indices to maintain
 #bdb#index             default pres,eq

diff --git a/tests/data/slapd-2db.conf b/tests/data/slapd-2db.conf
index 83ee32782f0852a3d0573f42407422bac53203e5..218c69c7dc96182225b116cbf39e9ad4df0ae6d4 100644 (file)
--- a/tests/data/slapd-2db.conf
+++ b/tests/data/slapd-2db.conf
@@ -32,8 +32,8 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix          "cn=Everyone,ou=Groups,dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 subordinate
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq
@@ -43,9 +43,9 @@ subordinate
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.b
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.b
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-aci.conf b/tests/data/slapd-aci.conf
index d47548798c5755eb75f1c3a1cc528d64fdee6a26..7db7860dd39eea1cf87ffc69ac5ab225d39c6c57 100644 (file)
--- a/tests/data/slapd-aci.conf
+++ b/tests/data/slapd-aci.conf
@@ -43,9 +43,9 @@ access to dn="cn=Subschema"
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index 0204e3da8820000e2b09faa36945b6d63bcb88f6..131b7a6f16a600025cb6a46ee75efee3bf7bb382 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -43,9 +43,9 @@ access                to *
 database       @BACKEND@
 
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-master.conf
index db55b5965c6f6bdd77349355204c824257c34307..7430581f9768b759853706f27b72bf8bdf498ca0 100644 (file)
--- a/tests/data/slapd-cache-master.conf
+++ b/tests/data/slapd-cache-master.conf
@@ -33,9 +33,9 @@ argsfile    @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-chain1.conf b/tests/data/slapd-chain1.conf
index b04990910d6f57b6a933ecf757cf6c7db99060b1..ac3237a6361d135ac02fa59ffcec05cb7fde0319 100644 (file)
--- a/tests/data/slapd-chain1.conf
+++ b/tests/data/slapd-chain1.conf
@@ -51,9 +51,10 @@ chain-idassert-bind  bindmethod=simple
 database       @BACKEND@
 
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-chain2.conf b/tests/data/slapd-chain2.conf
index 651c195b3bd23f13df408ad207fd83019163f328..ccf804e955a73755982ad28ab3439d6effdacdb5 100644 (file)
--- a/tests/data/slapd-chain2.conf
+++ b/tests/data/slapd-chain2.conf
@@ -40,9 +40,9 @@ argsfile      @TESTDIR@/slapd.2.args
 database       @BACKEND@
 
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-component.conf b/tests/data/slapd-component.conf
index 63928b3eed3747571158ccaa4ca89def80c62393..c65b786c1fe0f7527e5c1ec7112f08d8893aca7d 100644 (file)
--- a/tests/data/slapd-component.conf
+++ b/tests/data/slapd-component.conf
@@ -38,9 +38,9 @@ moduleload      @DATADIR@/comp_libs/compmatch.la
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass eq
 #hdb#index             objectClass eq
 #ndb#dbname db_1

diff --git a/tests/data/slapd-config-undo.conf b/tests/data/slapd-config-undo.conf
index edf0087b058fb35f6bef0fd5eb07e2b3794f29f3..82b5af068ca54bdc1991b0799c89192f25df333b 100644 (file)
--- a/tests/data/slapd-config-undo.conf
+++ b/tests/data/slapd-config-undo.conf
@@ -7,9 +7,9 @@ include         @SCHEMADIR@/core.schema
 
 database       @BACKEND@
 suffix         "o=undo"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,o=undo"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-dds.conf b/tests/data/slapd-dds.conf
index 0316cb872fe7bb0f629eb19b805d272075f9e183..a384a04c6c162e0c75a1bffdc0fc174da7d1005a 100644 (file)
--- a/tests/data/slapd-dds.conf
+++ b/tests/data/slapd-dds.conf
@@ -37,9 +37,9 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryExpireTimestamp    eq

diff --git a/tests/data/slapd-deltasync-master.conf b/tests/data/slapd-deltasync-master.conf
index 28c197e24ffd3a289f91876376fcd9a47fc8d7c0..96c24b77763577b3a3b10a79f03053956b9a797a 100644 (file)
--- a/tests/data/slapd-deltasync-master.conf
+++ b/tests/data/slapd-deltasync-master.conf
@@ -37,8 +37,8 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "cn=log"
-directory      @TESTDIR@/db.1.b
 rootdn         "cn=Manager,dc=example,dc=com"
+#~null~#directory      @TESTDIR@/db.1.b
 #bdb#index             objectClass     eq
 #bdb#index             entryUUID,entryCSN      eq
 #hdb#index             objectClass     eq
@@ -53,9 +53,9 @@ syncprov-nopresent true
 rootdn         "cn=Manager,dc=example,dc=com"
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq

diff --git a/tests/data/slapd-deltasync-slave.conf b/tests/data/slapd-deltasync-slave.conf
index 2244e9862e13e1b6209d8b2cb8873cfbfbcd7ffe..2eae0ea7f85472a9ef64579758f4dcfd1c670ea9 100644 (file)
--- a/tests/data/slapd-deltasync-slave.conf
+++ b/tests/data/slapd-deltasync-slave.conf
@@ -44,9 +44,10 @@ argsfile     @TESTDIR@/slapd.2.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-dn.conf b/tests/data/slapd-dn.conf
index fa205e1e494d6fa3bb00d1e09ac339f71cb4ece6..636810d1cfbbc0f958e5bc788a91e06339344931 100644 (file)
--- a/tests/data/slapd-dn.conf
+++ b/tests/data/slapd-dn.conf
@@ -35,9 +35,9 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-dynlist.conf b/tests/data/slapd-dynlist.conf
index 23decedbc98d4306c267bfae4ec75cb37f7bd886..6fdc7749fbf8277356d142384a343da32c40dcca 100644 (file)
--- a/tests/data/slapd-dynlist.conf
+++ b/tests/data/slapd-dynlist.conf
@@ -40,9 +40,9 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-emptydn.conf b/tests/data/slapd-emptydn.conf
index db93476b3380a28d2ac6356444fe295f0501774b..21605612fbdb5239a06c0b396322c1edd9d9641c 100644 (file)
--- a/tests/data/slapd-emptydn.conf
+++ b/tests/data/slapd-emptydn.conf
@@ -40,9 +40,9 @@ access                to dn.exact="cn=Subschema"
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq
@@ -65,9 +65,9 @@ access                to dn.subtree="dc=example,dc=com"
 
 database       @BACKEND@
 suffix         ""
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Manager,c=US"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf
index cb793688592f1410b92c5bda2932075ba9765d95..882f9ef8cbff6919592d953e47221179b18a0257 100644 (file)
--- a/tests/data/slapd-glue-syncrepl1.conf
+++ b/tests/data/slapd-glue-syncrepl1.conf
@@ -34,8 +34,8 @@ argsfile      @TESTDIR@/slapd.1.args
 database       @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
 subordinate
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager 1,dc=example,dc=com"
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
 #bdb#index             cn,sn   pres,eq,sub,subany
@@ -52,8 +52,8 @@ overlay               syncprov
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
 subordinate
-directory      @TESTDIR@/db.1.b
 rootdn         "cn=Manager 1,dc=example,dc=com"
+#~null~#directory      @TESTDIR@/db.1.b
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
 #bdb#index             cn,sn   pres,eq,sub,subany
@@ -83,9 +83,9 @@ updateref     @URI2@
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.c
 rootdn         "cn=Manager 1,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.c
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
 #bdb#index             cn,sn   pres,eq,sub,subany

diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf
index 752824fef351c2a13676ce5ca576f6ab1f373f85..2096fcc59fd69e2569fb6bff36a31b3770b8b05f 100644 (file)
--- a/tests/data/slapd-glue-syncrepl2.conf
+++ b/tests/data/slapd-glue-syncrepl2.conf
@@ -34,8 +34,8 @@ argsfile      @TESTDIR@/slapd.2.args
 database       @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
 subordinate
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Manager 2,dc=example,dc=com"
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
 #bdb#index             cn,sn   pres,eq,sub,subany
@@ -66,8 +66,8 @@ updateref     @URI1@
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
 subordinate
-directory      @TESTDIR@/db.2.b
 rootdn         "cn=Manager 2,dc=example,dc=com"
+#~null~#directory      @TESTDIR@/db.2.b
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
 #bdb#index             cn,sn   pres,eq,sub,subany
@@ -85,9 +85,9 @@ overlay               syncprov
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.2.c
 rootdn         "cn=Manager 2,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.2.c
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
 #bdb#index             cn,sn   pres,eq,sub,subany

diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index 1a7cd76ee7107912a89963600a0c9d6615c30db9..4f3a091daf1d688f186a5f05c4e77a732d7ca9e5 100644 (file)
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@@ -33,8 +33,8 @@ argsfile      @TESTDIR@/slapd.1.args
 database       @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
 subordinate
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager, dc=example,dc=com"
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
 #bdb#index             cn,sn   pres,eq,sub,subany
@@ -47,8 +47,8 @@ rootdn                "cn=Manager, dc=example,dc=com"
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
 subordinate
-directory      @TESTDIR@/db.1.b
 rootdn         "cn=Manager, dc=example,dc=com"
+#~null~#directory      @TESTDIR@/db.1.b
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
 #bdb#index             cn,sn   pres,eq,sub,subany
@@ -60,9 +60,9 @@ rootdn                "cn=Manager, dc=example,dc=com"
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.c
 rootdn         "cn=Manager, dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.c
 #bdb#index             objectclass     eq
 #bdb#index             uid     pres,eq,sub
 #bdb#index             cn,sn   pres,eq,sub,subany

diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf
index 8ad79cf0b635acb32375baa86d36cda92fa79095..b7ba69176100273f39109049f21153b62be19703 100644 (file)
--- a/tests/data/slapd-idassert.conf
+++ b/tests/data/slapd-idassert.conf
@@ -59,9 +59,9 @@ access to *
 database       @BACKEND@
 
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq
@@ -77,9 +77,9 @@ access to dn.exact="cn=Proxy,ou=Admin,dc=example,dc=com"
 database       @BACKEND@
 
 suffix         "dc=example,dc=it"
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Manager,dc=example,dc=it"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf
index 9b9356867f4ef54cce7b21c65a571f82b27bce2e..d15f43a9922ca878b460221e56d009e8cce5cbf4 100644 (file)
--- a/tests/data/slapd-ldapglue.conf
+++ b/tests/data/slapd-ldapglue.conf
@@ -68,9 +68,9 @@ uri             "@URI2@"
 # root
 database        @BACKEND@
 suffix          "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-ldapgluegroups.conf b/tests/data/slapd-ldapgluegroups.conf
index 40abe7a8e2441442c90609304d6d3aeac6852577..60dd332d62082e815d1cc98a76b616f402c11841 100644 (file)
--- a/tests/data/slapd-ldapgluegroups.conf
+++ b/tests/data/slapd-ldapgluegroups.conf
@@ -50,9 +50,9 @@ access to *
 # people branch
 database        @BACKEND@
 suffix          "ou=Groups,dc=example,dc=com"
-directory      @TESTDIR@/db.3.a
 rootdn         "cn=Manager,ou=Groups,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.3.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-ldapgluepeople.conf b/tests/data/slapd-ldapgluepeople.conf
index e23eaea440596d7b1e2b7a22256f8eb5d4cbe474..940ff9d053cd28d42f55eeb14cba02b2edee2385 100644 (file)
--- a/tests/data/slapd-ldapgluepeople.conf
+++ b/tests/data/slapd-ldapgluepeople.conf
@@ -51,9 +51,10 @@ access to *
 # people branch
 database        @BACKEND@
 suffix          "ou=People,dc=example,dc=com"
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Manager,ou=People,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-limits.conf b/tests/data/slapd-limits.conf
index ccdc5535c419e0686fe31f5642958636a551cd7e..654007e846b59b1e502ee573c409368b1d2cd179 100644 (file)
--- a/tests/data/slapd-limits.conf
+++ b/tests/data/slapd-limits.conf
@@ -33,9 +33,10 @@ argsfile     @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
+
 # Need quality indices on "uid" to check "unchecked" limits...
 #bdb#index             objectClass eq
 #bdb#index             uid eq

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index cbb9276ab8ecf74775e9e833a7a9d428499cfa3e..e8dcc62ad9e6b290431702b8be16f8e4152fbbf3 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -35,9 +35,9 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass eq
 #hdb#index             objectClass eq
 #ndb#dbname db_1

diff --git a/tests/data/slapd-meta-target1.conf b/tests/data/slapd-meta-target1.conf
index 5e9195437b2643d5e4c515577e26fba7fd7144b6..ddb9dc440c07c32e548b7843a0763216f01a4451 100644 (file)
--- a/tests/data/slapd-meta-target1.conf
+++ b/tests/data/slapd-meta-target1.conf
@@ -38,9 +38,10 @@ sockbuf_max_incoming 4194303
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-meta-target2.conf b/tests/data/slapd-meta-target2.conf
index 58221b91739dddcf8b2d471f0ede726260a73bb5..5e76e65912dd3a30e5508495f98cf34ea1adbdff 100644 (file)
--- a/tests/data/slapd-meta-target2.conf
+++ b/tests/data/slapd-meta-target2.conf
@@ -43,9 +43,10 @@ idletimeout  5
 
 database       @BACKEND@
 suffix         "ou=Meta,dc=example,dc=com"
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Manager,ou=Meta,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-ppolicy.conf b/tests/data/slapd-ppolicy.conf
index 35eef20cc43829a21099c1283c050f2e99c46089..57008a4538313184cffed1dd095fa09d3644d152 100644 (file)
--- a/tests/data/slapd-ppolicy.conf
+++ b/tests/data/slapd-ppolicy.conf
@@ -33,9 +33,9 @@ include               @SCHEMADIR@/ppolicy.schema
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass eq
 #hdb#index             objectClass eq
 #ndb#dbname db_1

diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf
index e0da53b26b7818a733fbf63cff4d937682173e54..62c8b3e4282052d17d47ac0ca996ed13e097bcf4 100644 (file)
--- a/tests/data/slapd-proxycache.conf
+++ b/tests/data/slapd-proxycache.conf
@@ -57,7 +57,7 @@ pcachebind            (&(objectclass=person)(uid=)) 1 @BTTR@ sub "ou=Alumni Association,ou
 #bdb#cachesize 20
 #hdb#cachesize 20
 
-directory      @TESTDIR@/db.2.a
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid,mail  pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index 2ca7ee0cd58fe3b6f35d94dddf282f10d5f73998..e747a6e12e2f448df22bc329ad156d48bd9c6a71 100644 (file)
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -33,9 +33,10 @@ argsfile     @TESTDIR@/slapd.1.args
 database       @BACKEND@
 
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index 8c0d97c5955e6cac31458b5940d7c3b7b584aa23..11bc9e2ce01fb649fe99e91c45e349d910c43a03 100644 (file)
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -38,9 +38,9 @@ database      @BACKEND@
 #hdb#cachesize 0
 
 suffix         "o=University of Mich,c=US"
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Manager,o=University of Mich,c=US"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf
index 7df5ab6e8085e1b768ae7d54ca49a73df5ed9ce2..3b1d63ec7cc83510271877a1ed4036c0187f667c 100644 (file)
--- a/tests/data/slapd-referrals.conf
+++ b/tests/data/slapd-referrals.conf
@@ -32,9 +32,9 @@ argsfile      @TESTDIR@/slapd.args
 
 database       @BACKEND@
 suffix         "c=us"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,c=us"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass eq
 #hdb#index             objectClass eq
 #ndb#dbname db_1

diff --git a/tests/data/slapd-refint.conf b/tests/data/slapd-refint.conf
index c8ecf3bea6c83735377a2ba140b5645c247ef611..81016406cf2291d55cba7ad28b705dbca8a4545f 100644 (file)
--- a/tests/data/slapd-refint.conf
+++ b/tests/data/slapd-refint.conf
@@ -36,9 +36,9 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "o=refint"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,o=refint"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf
index 11d3f6b6207e6872641389fff4235f1891534758..6bdd522f3cb67b269766dbdb58b88f7cb012ea28 100644 (file)
--- a/tests/data/slapd-relay.conf
+++ b/tests/data/slapd-relay.conf
@@ -41,9 +41,10 @@ argsfile     @TESTDIR@/slapd.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass eq
 #hdb#index             objectClass eq
 #ndb#dbname db_1

diff --git a/tests/data/slapd-repl-slave-remote.conf b/tests/data/slapd-repl-slave-remote.conf
index a8738c55fedeb13113f0c9ac63fad54f4f0cf4bd..cd48800ce08b0a4378d60cbca14ae0978f85b966 100644 (file)
--- a/tests/data/slapd-repl-slave-remote.conf
+++ b/tests/data/slapd-repl-slave-remote.conf
@@ -50,13 +50,14 @@ access to *
 database       @BACKEND@
 
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
 # HACK: use the RootDN of the monitor database as UpdateDN so ACLs apply
 # without the need to write the UpdateDN before starting replication
 updatedn       "cn=Monitor"
 updateref      @URI1@
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID       pres,eq

diff --git a/tests/data/slapd-retcode.conf b/tests/data/slapd-retcode.conf
index a6953ac88109e3d881d99843c04f14252af4fa06..86e2bab5ce6cbfb1ad1222b60b9aba5d3085c6b0 100644 (file)
--- a/tests/data/slapd-retcode.conf
+++ b/tests/data/slapd-retcode.conf
@@ -37,9 +37,9 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index f9fc2361772e8f28333729625a1b376d0e84c2f0..3c07860431f430ce00e6d69d0b281c020f7919c2 100644 (file)
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -46,7 +46,7 @@ rootdse       @DATADIR@/rootdse.ldif
 
 database       @BACKEND@
 suffix         "o=OpenLDAP Project,l=Internet"
-directory      @TESTDIR@/db.1.a
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass eq
 #hdb#index             objectClass eq
 #ndb#dbname db_1_a

diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf
index c56895cd4533df4ab56150095f4911e4ac68e7f8..866b76a6e470e832bb5643f409352d9749e119f1 100644 (file)
--- a/tests/data/slapd-syncrepl-master.conf
+++ b/tests/data/slapd-syncrepl-master.conf
@@ -35,9 +35,9 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq

diff --git a/tests/data/slapd-syncrepl-multiproxy.conf b/tests/data/slapd-syncrepl-multiproxy.conf
index 84e6ef30c808073e56c442fe70d9e2e22447bc52..16a4b8cf2f5571f2ddaeb4e8079e398ddb089a62 100644 (file)
--- a/tests/data/slapd-syncrepl-multiproxy.conf
+++ b/tests/data/slapd-syncrepl-multiproxy.conf
@@ -37,9 +37,9 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq

diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index 4a41e55a25398ae813e829a2143f01066feeaf82..70e072de9d896b890382643a8dc9f522de83c290 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -44,9 +44,10 @@ argsfile     @TESTDIR@/slapd.4.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.4.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.4.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq

diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf
index 6f9617362eeeada8fe6c31693163d1d9f3571920..6412cd538348f74f26b4010793f8c3ad41c61e3f 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist2.conf
+++ b/tests/data/slapd-syncrepl-slave-persist2.conf
@@ -21,9 +21,9 @@ argsfile      @TESTDIR@/slapd.5.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.5.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.5.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq

diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf
index 753314651ed2f40afe4607df7689e6bd0be6f566..825c5fe113a52c7807e8ecb775fb576fa99ffc44 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist3.conf
+++ b/tests/data/slapd-syncrepl-slave-persist3.conf
@@ -33,9 +33,9 @@ argsfile      @TESTDIR@/slapd.6.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.6.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.6.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq

diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf
index 6accc9596d02dd3fab534f9bf7013e0923862243..b78bf2300844dfb8d872caa0627a3ed23f2c585c 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh1.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh1.conf
@@ -35,9 +35,9 @@ argsfile      @TESTDIR@/slapd.2.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq

diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf
index a7a9c8d2c79c9544993be2fe5ff8cd8085329be9..199b7d3aca542561d36e86f3900b80987ff4390d 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh2.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh2.conf
@@ -33,9 +33,9 @@ argsfile      @TESTDIR@/slapd.3.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.3.a
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.3.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#index             entryUUID,entryCSN      eq

diff --git a/tests/data/slapd-translucent-local.conf b/tests/data/slapd-translucent-local.conf
index 5d6e8c45f63adbdcbb84cd06089669586f91cc19..cc576b79ac59252640f8aaceb44d920bc0ee3564 100644 (file)
--- a/tests/data/slapd-translucent-local.conf
+++ b/tests/data/slapd-translucent-local.conf
@@ -41,9 +41,10 @@ argsfile     @TESTDIR@/slapd.2.args
 
 database       @BACKEND@
 suffix         "o=translucent"
-directory      @TESTDIR@/db.2.a
 rootdn         "o=translucent"
 rootpw         secret
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-translucent-remote.conf b/tests/data/slapd-translucent-remote.conf
index d497f93f9e46366b18f7f9285b78f9c72779b86e..8cfe4869f5627eda14a4b170b660ca0d32ff86b6 100644 (file)
--- a/tests/data/slapd-translucent-remote.conf
+++ b/tests/data/slapd-translucent-remote.conf
@@ -36,9 +36,10 @@ argsfile     @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "o=translucent"
-directory      @TESTDIR@/db.1.a
 rootdn         "o=translucent"
 rootpw         secret
+#null#bind             on
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-unique.conf b/tests/data/slapd-unique.conf
index 90e2f10ed2548d79bb2b90a629bdb25d1d3b602f..37c741579fb7bfd111e8717663fa1fa2b2056121 100644 (file)
--- a/tests/data/slapd-unique.conf
+++ b/tests/data/slapd-unique.conf
@@ -36,9 +36,9 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "o=unique"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,o=unique"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-valregex.conf b/tests/data/slapd-valregex.conf
index 72557c1a4b6d0e372da360062c16999ecf349b77..5059e1d85ce9d421f68c3be3878ba192b547d810 100644 (file)
--- a/tests/data/slapd-valregex.conf
+++ b/tests/data/slapd-valregex.conf
@@ -43,9 +43,9 @@ access                to *
 database       @BACKEND@
 
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-valsort.conf b/tests/data/slapd-valsort.conf
index 4e5c3e29ff59ff2fa56bbce6b3344e0e74bd01b9..5e2071e7942dfe98e3b6b49057f595e609da559d 100644 (file)
--- a/tests/data/slapd-valsort.conf
+++ b/tests/data/slapd-valsort.conf
@@ -34,9 +34,9 @@ argsfile      @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "o=valsort"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,o=valsort"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd-whoami.conf b/tests/data/slapd-whoami.conf
index d291547dc5cc80339f1b378dfb6b5000054de1b9..579134cdd47b49028c14358041d5649c23526d83 100644 (file)
--- a/tests/data/slapd-whoami.conf
+++ b/tests/data/slapd-whoami.conf
@@ -53,9 +53,9 @@ access to *
 database       @BACKEND@
 
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq

diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index b2d94c8dd49496947ce3b76cb6fcff76f1e9c23c..dcf52f3b4eb491778e6baf1dcff919fc72ad1797 100644 (file)
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -38,9 +38,9 @@ sockbuf_max_incoming 4194303
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #bdb#checkpoint                1024 5

diff --git a/tests/data/slapd2.conf b/tests/data/slapd2.conf
index ff7a8a543cb584590933d484d375df41e3bf97d1..8d9a7a6c3e4adc8379688e8f41446add11fc494c 100644 (file)
--- a/tests/data/slapd2.conf
+++ b/tests/data/slapd2.conf
@@ -33,9 +33,9 @@ argsfile      @TESTDIR@/slapd.2.args
 
 database       @BACKEND@
 suffix         "dc=example,dc=com"
-directory      @TESTDIR@/db.2.a
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq