From f0814691446fc9d8c852b85cf4617ecc22512c1c Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 21 Jul 2001 18:14:08 +0000 Subject: [PATCH] changes from plugfest --- tests/data/slapd-schema.conf | 13 ------------- tests/data/slapd.conf | 7 +------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf index 50d9060fe1..3546287243 100644 --- a/tests/data/slapd-schema.conf +++ b/tests/data/slapd-schema.conf @@ -23,22 +23,9 @@ argsfile ./test-db/slapd.args # ldbm database definitions ####################################################################### -<<<<<<< slapd-schema.conf database ldbm -suffix "o=OpenLDAP Project, l=Internet" -======= -database @BACKEND@ suffix "o=OpenLDAP Project,l=Internet" ->>>>>>> 1.11 directory ./test-db -<<<<<<< slapd-schema.conf dbnosync dbnolocking -======= index objectClass eq - -#database @BACKEND@ -#suffix "dc=example,dc=com" -#directory ./test-repl -#index objectClass eq ->>>>>>> 1.11 diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf index 4ba2be876e..94c60360b7 100644 --- a/tests/data/slapd.conf +++ b/tests/data/slapd.conf @@ -23,15 +23,10 @@ rootpw secret index objectclass eq index uid pres,eq,sub index cn,sn pres,eq,sub,subany -<<<<<<< slapd.conf dbnosync dbnolocking -======= -#ldbm#dbnosync -#ldbm#dbnolocking -database @BACKEND@ +database ldbm suffix "dc=OpenLDAP,dc=org" directory ./test-repl index objectclass eq ->>>>>>> 1.11