Merge remote branch 'origin/mdb.master'

[openldap] / tests / data / slapd-valsort.conf

diff --git a/tests/data/slapd-valsort.conf b/tests/data/slapd-valsort.conf
index 899f51368b44adaf8ae76e348810d78cc0394ab3..229d5c7f28674ff190d96c77f3eb772af85933b4 100644 (file)
--- a/tests/data/slapd-valsort.conf
+++ b/tests/data/slapd-valsort.conf
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2004-2005 The OpenLDAP Foundation.
+## Copyright 2004-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -34,15 +34,13 @@ argsfile    @TESTDIR@/slapd.1.args
 
 database       @BACKEND@
 suffix         "o=valsort"
-directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,o=valsort"
 rootpw         secret
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid       pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid       pres,eq,sub
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
+#~null~#directory      @TESTDIR@/db.1.a
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#ndb#dbname db_1
+#ndb#include @DATADIR@/ndb.conf
 
 overlay                        valsort
 valsort-attr           sn ou=users,o=valsort alpha-ascend
@@ -52,6 +50,6 @@ valsort-attr            ou ou=users,o=valsort weighted
 valsort-attr            employeeType ou=users,o=valsort weighted alpha-ascend
 
 database config
-rootpw secret
+include        @TESTDIR@/configpw.conf
 
 #monitor#database      monitor