Merge remote branch 'origin/mdb.master'

[openldap] / tests / data / slapd-translucent-local.conf

diff --git a/tests/data/slapd-translucent-local.conf b/tests/data/slapd-translucent-local.conf
index 33bbcfd34a5be1f35de52f6d8b2c5c83dce221a9..cff497ec3e68b041486e8ff522dd3953b767d5fe 100644 (file)
--- a/tests/data/slapd-translucent-local.conf
+++ b/tests/data/slapd-translucent-local.conf
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2004-2006 The OpenLDAP Foundation.
+## Copyright 2004-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -41,26 +41,25 @@ argsfile    @TESTDIR@/slapd.2.args
 
 database       @BACKEND@
 suffix         "o=translucent"
-directory      @TESTDIR@/db.2.a
 rootdn         "o=translucent"
 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#bind             on
+#~null~#directory      @TESTDIR@/db.2.a
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#ndb#dbname db_2
+#ndb#include @DATADIR@/ndb.conf
 
 overlay                translucent
 translucent_no_glue
 
 uri            @URI1@
 # "lastmod off" is not strictly required because the instance of back-ldap
-# added by the translucent overlay sets it off for the underling database;
+# added by the translucent overlay sets it off for the underlying database;
 # however, the local database needs to have "lastmod off" so it's here as
 # a reminder.
 lastmod        off
 acl-bind       binddn="uid=binder,o=translucent" credentials="bindtest"
 
 database config
-include                "configpw.conf"
+include                @TESTDIR@/configpw.conf