First rounded of changes in prep for 2.2.beta3

[openldap] / tests / data / slapd.conf

diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index 5942610de95847fefcfba9ac07915cca593e3db5..350280aa873c9cf3c857fd49d1132578ca8a26be 100644 (file)
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -9,27 +9,24 @@ include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
 include ./schema/nis.schema
-pidfile     ./test-db/slapd.pid
-argsfile    ./test-db/slapd.args
+
+#
+pidfile     ./testrun/slapd.1.pid
+argsfile    ./testrun/slapd.1.args
 
 modulepath      ../servers/slapd/back-@BACKEND@/
 @MODULELOAD@
 
+
 #######################################################################
-# ldbm database definitions
+# database definitions
 #######################################################################
 
 database       @BACKEND@
-suffix         "o=University of Michigan, c=US"
-directory      ./test-db
-rootdn         "cn=Manager, o=University of Michigan, c=US"
+suffix         "o=University of Michigan,c=US"
+directory      ./testrun/db.1.a
+rootdn         "cn=Manager,o=University of Michigan,c=US"
 rootpw         secret
-#ldbm#index            objectclass     eq
-#ldbm#index            uid     pres,eq,sub
-#ldbm#index            name    pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
-#bdb#index             objectclass     eq
-#bdb#index             uid     pres,eq,sub
-#bdb#index             name    pres,eq,sub,subany
-#bdb#lockdetect default 5
+index          objectClass     eq
+index          cn,sn,uid       pres,eq,sub
+