From: Jong Hyuk Choi <jongchoi@openldap.org>
Date: Tue, 15 Jul 2003 00:22:55 +0000 (+0000)
Subject: SyncRepl works both with back-bdb and back-ldbm
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~826
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fdf0a57dfa24660cce42f4d7e21a192cf29b2cbe;p=openldap

SyncRepl works both with back-bdb and back-ldbm
---

diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf
index 0afe6cb9f6..8538c99871 100644
--- 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 ba3eb66ab6..5cc86cb82f 100644
--- 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 a91fff80b2..7451d23cd7 100644
--- 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 e6f04c801f..1a949c2b76 100644
--- 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 b96c637471..d24815a1c4 100644
--- 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 aa7a87a261..d2310e6034 100644
--- 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 c091a0836b..199d5c384e 100644
--- 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"