Minor changes from plugfest

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index e27efa78af4f64a5bdfdf0f0f72b2671ad0093c5..50d9060fe15be5052c7bc73a4ff748181a216f51 100644 (file)
--- 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 4215303d8caae76611e8bbf13624d3019d92bfde..4ba2be876e679182d405f06f7639da85b7cff117 100644 (file)
--- 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