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 3f4ed66066d75156a27cc8c1b6621100f7176e8b..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 The OpenLDAP Foundation.
+## Copyright 2004-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,15 +14,15 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 ucdata-path    ./ucdata
-include ./schema/core.schema
-include ./schema/cosine.schema
-include ./schema/inetorgperson.schema
-include ./schema/openldap.schema
-include ./schema/nis.schema
+include                @SCHEMADIR@/core.schema
+include                @SCHEMADIR@/cosine.schema
+include                @SCHEMADIR@/inetorgperson.schema
+include                @SCHEMADIR@/openldap.schema
+include                @SCHEMADIR@/nis.schema
 
 #
-pidfile     ./testrun/slapd.2.pid
-argsfile    ./testrun/slapd.2.args
+pidfile                @TESTDIR@/slapd.2.pid
+argsfile       @TESTDIR@/slapd.2.args
 
 #mod#modulepath        ../servers/slapd/back-@BACKEND@
 #mod#moduleload        back_@BACKEND@.la
@@ -30,6 +30,8 @@ argsfile    ./testrun/slapd.2.args
 #ldapmod#moduleload back_ldap.la
 #translucentmod#modulepath     ../servers/slapd/overlays
 #translucentmod#moduleload     translucent.la
+#monitormod#modulepath ../servers/slapd/back-monitor
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # database definitions
@@ -39,17 +41,25 @@ argsfile    ./testrun/slapd.2.args
 
 database       @BACKEND@
 suffix         "o=translucent"
-directory      ./testrun/db.2.a
 rootdn         "o=translucent"
 rootpw         secret
-index          objectClass     eq
-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
 
-# XXX this uri really shouldn't be hardcoded
 uri            @URI1@
-lastmod                off
-acl-authcDN            uid=binder,o=translucent
-acl-passwd             bindtest
+# "lastmod off" is not strictly required because the instance of back-ldap
+# 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                @TESTDIR@/configpw.conf