SyncRepl works both with back-bdb and back-ldbm

diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf
index 0afe6cb9f6b4cec8574afcaf67f2062ac1c4fc29..8538c99871dab5ba7830b1347c49a77371c3195b 100644 (file)
--- a/tests/data/slapd-proxycache.conf
+++ b/tests/data/slapd-proxycache.conf
@@ -38,8 +38,8 @@ suffix          "o=University of Michigan,c=US"
 uri            ldap://127.0.0.1:9009/o=University%20of%20Michigan,c=US
 cacheparams    10000 15000 2 @ENTRY_LIMIT@ @CACHETTL@
 
-attrset 0      sn cn title
-attrset 1      mail postaladdress telephonenumber
+attrset 0      sn cn title uid
+attrset 1      mail postaladdress telephonenumber cn uid
 addtemplate    (|(cn=)(sn=)) 0 @CACHETTL@
 addtemplate    (sn=) 0 @CACHETTL@
 addtemplate    (uid=) 1 @CACHETTL@

diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf
index ba3eb66ab67f61aff8615450fe37bd31658e586f..5cc86cb82f86532d198a2b7f3bfe40bea650810c 100644 (file)
--- a/tests/data/slapd-syncrepl-master.conf
+++ b/tests/data/slapd-syncrepl-master.conf
@@ -15,11 +15,10 @@ modulepath      ../servers/slapd/back-@BACKEND@/
 @MODULELOAD@
 
 #######################################################################
-# ldbm database definitions
+# master database definitions
 #######################################################################
 
 database       @BACKEND@
-#ldbm#cachesize        0
 suffix         "o=University of Michigan,c=US"
 directory      ./test-db
 rootdn         "cn=Manager,o=University of Michigan,c=US"

diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index a91fff80b2b2b290e66869ef3a0b88c76e97bf70..7451d23cd774b0703af0b787b19a497fad54dc53 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -15,11 +15,10 @@ modulepath      ../servers/slapd/back-@BACKEND@/
 @MODULELOAD@
 
 #######################################################################
-# ldbm database definitions
+# consumer database definitions
 #######################################################################
 
 database       @BACKEND@
-#ldbm#cachesize        0
 suffix         "o=University of Michigan,c=US"
 directory      ./test-repl/p1
 rootdn         "cn=Replica,o=University of Michigan,c=US"

diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf
index e6f04c801ffb8342263022e07f802a4e541c24e8..1a949c2b76a743b4cdc4982ab67a7a2de0be5e93 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist2.conf
+++ b/tests/data/slapd-syncrepl-slave-persist2.conf
@@ -15,11 +15,10 @@ modulepath      ../servers/slapd/back-@BACKEND@/
 @MODULELOAD@
 
 #######################################################################
-# ldbm database definitions
+# consumer database definitions
 #######################################################################
 
 database       @BACKEND@
-#ldbm#cachesize        0
 suffix         "o=University of Michigan,c=US"
 directory      ./test-repl/p2
 rootdn         "cn=Replica,o=University of Michigan,c=US"

diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf
index b96c637471f510f7d4b7349aa5c6b662d43270c9..d24815a1c4393cbfe8912d7b54040b990ab79919 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist3.conf
+++ b/tests/data/slapd-syncrepl-slave-persist3.conf
@@ -15,11 +15,10 @@ modulepath      ../servers/slapd/back-@BACKEND@/
 @MODULELOAD@
 
 #######################################################################
-# ldbm database definitions
+# consumer database definitions
 #######################################################################
 
 database       @BACKEND@
-#ldbm#cachesize        0
 suffix         "o=University of Michigan,c=US"
 directory      ./test-repl/p3
 rootdn         "cn=Replica,o=University of Michigan,c=US"

diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf
index aa7a87a2616a1948dc2eb891555759f996c6b00c..d2310e6034e47e1e22578c88d31e9815030ed498 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh1.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh1.conf
@@ -15,11 +15,10 @@ modulepath      ../servers/slapd/back-@BACKEND@/
 @MODULELOAD@
 
 #######################################################################
-# ldbm database definitions
+# consumer database definitions
 #######################################################################
 
 database       @BACKEND@
-#ldbm#cachesize        0
 suffix         "o=University of Michigan,c=US"
 directory      ./test-repl/r1
 rootdn         "cn=Replica,o=University of Michigan,c=US"

diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf
index c091a0836bbed625bb84ec50b51a9f69f4cb92a2..199d5c384e0510241d894f1ce57a33a34b4644d9 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh2.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh2.conf
@@ -15,11 +15,10 @@ modulepath      ../servers/slapd/back-@BACKEND@/
 @MODULELOAD@
 
 #######################################################################
-# ldbm database definitions
+# consumer database definitions
 #######################################################################
 
 database       @BACKEND@
-#ldbm#cachesize        0
 suffix         "o=University of Michigan,c=US"
 directory      ./test-repl/r2
 rootdn         "cn=Replica,o=University of Michigan,c=US"