Define SLAP_USE_CONFDIR, fix moduleload

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

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 6d433315230ab365167a11c11909dc9ccd81c08e..2f5828ef660b035156bcc962a5e5bb94b3b6dfe4 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -1,8 +1,9 @@
 # master slapd config -- for testing
-# $OpenLDAP$
+# $OpenLDAP: pkg/ldap/tests/data/slapd-master.conf,v 1.33.2.4 2003/12/15 22:05
+ :29 kurt Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2003 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -13,7 +14,6 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-ucdata-path    ./ucdata
 include ./schema/core.schema
 include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
@@ -25,17 +25,21 @@ include ./testdata/ditcontentrules.conf
 pidfile     ./testrun/slapd.1.pid
 argsfile    ./testrun/slapd.1.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
-# ldbm database definitions
+# database definitions
 #######################################################################
 
 database       @BACKEND@
-suffix         "o=University of Michigan,c=US"
+suffix         "dc=example,dc=com"
 directory      ./testrun/db.1.a
-rootdn         "cn=Manager,o=University of Michigan,c=US"
+rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
 #ldbm#index            objectClass eq
 #bdb#index             objectClass eq
+
+#monitor#database monitor