Merge remote branch 'origin/mdb.master'

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

diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index e03f205d1767c580315c3b68a875c8472d20b9e3..39602073acde176310d2ab681466f53077a9e5ea 100644 (file)
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -1,9 +1,8 @@
 # master slapd config -- for testing
-# $OpenLDAP: pkg/ldap/tests/data/slapd-pw.conf,v 1.19.2.4 2003/12/15 22:05:29 
- kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,13 +13,13 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-include ./schema/core.schema
-include ./schema/cosine.schema
-include ./schema/inetorgperson.schema
-include ./schema/openldap.schema
-include ./schema/nis.schema
-pidfile     ./testrun/slapd.1.pid
-argsfile    ./testrun/slapd.1.args
+include                @SCHEMADIR@/core.schema
+include                @SCHEMADIR@/cosine.schema
+include                @SCHEMADIR@/inetorgperson.schema
+include                @SCHEMADIR@/openldap.schema
+include                @SCHEMADIR@/nis.schema
+pidfile                @TESTDIR@/slapd.1.pid
+argsfile       @TESTDIR@/slapd.1.args
 
 #mod#modulepath        ../servers/slapd/back-@BACKEND@/
 #mod#moduleload        back_@BACKEND@.la
@@ -32,24 +31,23 @@ argsfile    ./testrun/slapd.1.args
 #######################################################################
 
 database       @BACKEND@
-#ldbm#cachesize        0
+
 suffix         "dc=example,dc=com"
-directory      ./testrun/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
 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.1.a
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid       pres,eq,sub
+#ndb#dbname db_1
+#ndb#include @DATADIR@/ndb.conf
 
 #
 # normal installations should protect root dse,
 # cn=monitor, cn=schema, and cn=config
 #
 
-access to attr=userpassword
+access to attrs=userpassword
        by anonymous auth
        by self write
 
@@ -57,4 +55,4 @@ access to *
        by self write
        by * read
 
-#monitor#database monitor
+#monitor#database      monitor