From f14907b1453838ef7470d3304c464e3a920465e8 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 21 Jul 2001 18:12:27 +0000 Subject: [PATCH] Minor changes from plugfest --- tests/data/slapd-schema.conf | 14 ++++++++++++++ tests/data/slapd.conf | 10 ++++++++++ 2 files changed, 24 insertions(+) diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf index e27efa78af..50d9060fe1 100644 --- a/tests/data/slapd-schema.conf +++ b/tests/data/slapd-schema.conf @@ -23,8 +23,22 @@ 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 4215303d8c..4ba2be876e 100644 --- a/tests/data/slapd.conf +++ b/tests/data/slapd.conf @@ -23,5 +23,15 @@ 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@ +suffix "dc=OpenLDAP,dc=org" +directory ./test-repl +index objectclass eq +>>>>>>> 1.11 -- 2.47.2