ITS#2740, #2859 fixes for dynamic backends

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index 2c4a1f2573b1f77889fe67d1a49dfce515e66f1a..d54893fc872737106e8586276fd6f1c3345f0bb3 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -26,8 +26,8 @@ argsfile    ./testrun/slapd.1.args
 access to dn.base="" attr=objectClass by users read
 access to * by * read
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-master.conf
index 122e98fb4ee88a2c8464cc27ffdf7d1df5309a38..881c23e366736a3e089b754dbacd8fe934f6fd1d 100644 (file)
--- a/tests/data/slapd-cache-master.conf
+++ b/tests/data/slapd-cache-master.conf
@@ -23,8 +23,8 @@ include ./schema/nis.schema
 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
 
 #######################################################################
 # database definitions

diff --git a/tests/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf
index b8eaf00801921345f5b2f118db236331db9b0ab1..fe07cfd283d5aba178465deef58195a0ffb5013c 100644 (file)
--- a/tests/data/slapd-dnssrv.conf
+++ b/tests/data/slapd-dnssrv.conf
@@ -21,8 +21,8 @@ argsfile    ./test-db/slapd.args
 sasl-secprops noanonymous
 #sasl-secprops none
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index f942ab26c02c10f16a974479ec1e9ee89e081a71..2a7758d90bed982c97fbc6e69c316376f0737355 100644 (file)
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@@ -22,8 +22,8 @@ include ./schema/nis.schema
 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
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 6d433315230ab365167a11c11909dc9ccd81c08e..c67b0fc4acdf0828ff8dce1942ce3f11cb72b107 100644 (file)
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -25,8 +25,8 @@ 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
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-nis-master.conf b/tests/data/slapd-nis-master.conf
index fbf36868cb778256362ccb05d50abd62e956a778..fc624be89fd76cd830ecc6d0b86e1e8e164f9a75 100644 (file)
--- a/tests/data/slapd-nis-master.conf
+++ b/tests/data/slapd-nis-master.conf
@@ -23,8 +23,8 @@ include               ./schema/internet_mail.oc.conf
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf
index ffe8d65216170497182e26563b01a76a66b4802e..54bea414d922daa77c098aad01d4d93c7960102a 100644 (file)
--- a/tests/data/slapd-passwd.conf
+++ b/tests/data/slapd-passwd.conf
@@ -22,8 +22,8 @@ include ./schema/nis.schema
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf
index b8b74134e0a4b8316e5e79d76044029538aa2c8a..b2add6011e82545c3f8f73288f7c579715c5aa43 100644 (file)
--- a/tests/data/slapd-proxycache.conf
+++ b/tests/data/slapd-proxycache.conf
@@ -25,8 +25,10 @@ argsfile    ./testrun/slapd.2.args
 
 access to * by write
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
+#ldapmod#moduleload    ../servers/slapd/back-ldap/back_ldap.la
+#metamod#moduleload    ../servers/slapd/back-meta/back_meta.la
 
 #######################################################################
 # database definitions

diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index 25a0646f2a5d8634e84c685a9d9764e44c6bfa0b..d1ed9552b2c5ae4ebb3b72273161de7882e6c011 100644 (file)
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -24,8 +24,8 @@ argsfile    ./testrun/slapd.1.args
 
 # password-hash        {md5}
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index ffaab2a17e830f6730b8d289f4e06fd2b6675e8d..ceb4e474d63141c24806ce00d099795dcb1076b5 100644 (file)
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -23,8 +23,8 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.2.pid
 argsfile    ./testrun/slapd.2.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf
index 1715ed180c719798d24a6ea240f73ecc90812afc..a4ab35702511a69bd3226e3bf66068247ad0f256 100644 (file)
--- a/tests/data/slapd-referrals.conf
+++ b/tests/data/slapd-referrals.conf
@@ -22,8 +22,8 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.pid
 argsfile    ./testrun/slapd.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index d63f800ccae34c4f5fb6a852d4fb6f5c9eb6288d..6c5d3077b618e55ed5f6d4ffe11742b9a97e6884 100644 (file)
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@@ -23,8 +23,8 @@ include ./schema/nis.schema
 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
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index df8e27c917c9d6b673a57779d82c9165f155801f..94b23e41a04b1e819086785644ac48a865cfa581 100644 (file)
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -23,8 +23,8 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.2.pid
 argsfile    ./testrun/slapd.2.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index b01053a75c053d37af59914601f143a695297c58..15f7c57a4c720a12975d754bb8fac3e37c86baad 100644 (file)
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -33,8 +33,8 @@ argsfile    ./testrun/slapd.1.args
 #
 rootdse        ./testdata/rootdse.ldif
 
-modulepath     ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # ldbm database definitions

diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf
index 35d51145ddafac5f1a564da71dbf6b3c29680f5e..a5d8d0b0973362714defd679e85d14dbe586c6ab 100644 (file)
--- a/tests/data/slapd-syncrepl-master.conf
+++ b/tests/data/slapd-syncrepl-master.conf
@@ -23,8 +23,8 @@ include ./schema/nis.schema
 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
 
 #######################################################################
 # master database definitions

diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index 6a7c2016af778168d49fddf6308902d1e31c013c..3eba9cf27547035824e5acc7ac388e66ecb01d61 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -23,8 +23,8 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.4.pid
 argsfile    ./testrun/slapd.4.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # consumer database definitions

diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf
index 7b9ca28a894b479af446bdcc09cfeca1bf953169..d0d80058f8c5fba79809d403689f2d5ad2a9a47b 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist2.conf
+++ b/tests/data/slapd-syncrepl-slave-persist2.conf
@@ -11,8 +11,8 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.5.pid
 argsfile    ./testrun/slapd.5.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # consumer database definitions

diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf
index 01cb1799d72aea94b5b6c7e27eec21e56885384b..372104a59a4a83ea70979dd690fa569467c1b2da 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist3.conf
+++ b/tests/data/slapd-syncrepl-slave-persist3.conf
@@ -23,8 +23,8 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.6.pid
 argsfile    ./testrun/slapd.6.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # consumer database definitions

diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf
index b4cfc380d5e0c27ccc0f33fa8a7df00e80b43639..f0ee980a4a8313866bd211c0ef13da03928eca3e 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh1.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh1.conf
@@ -23,8 +23,8 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.2.pid
 argsfile    ./testrun/slapd.2.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # consumer database definitions

diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf
index 64c6ccb6eb517b2ebcafca41e1f93ece7b532160..3a755be615acbb4a1fe74084b5b59f07b323c35b 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh2.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh2.conf
@@ -23,8 +23,8 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.3.pid
 argsfile    ./testrun/slapd.3.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # consumer database definitions

diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index 9d6af807fc3357b847000120edaf7ff3eb9ec78b..0820faed5f8a20b623e2a916aac384e81bf197c3 100644 (file)
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -24,9 +24,8 @@ include ./schema/nis.schema
 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
 
 #######################################################################
 # database definitions

diff --git a/tests/data/slapd2.conf b/tests/data/slapd2.conf
index 296f2e90755113ab39c82cea27942e2932fad086..fa58dbfdddb28c56850071d56dfbe461cc0391b4 100644 (file)
--- a/tests/data/slapd2.conf
+++ b/tests/data/slapd2.conf
@@ -23,9 +23,8 @@ include ./schema/nis.schema
 pidfile     ./testrun/slapd.2.pid
 argsfile    ./testrun/slapd.2.args
 
-modulepath      ../servers/slapd/back-@BACKEND@/
-@MODULELOAD@
-
+#mod#modulepath        ../servers/slapd/back-@BACKEND@/
+#mod#moduleload        back_@BACKEND@.la
 
 #######################################################################
 # database definitions

diff --git a/tests/run.in b/tests/run.in
index 5c7ac93f90e9d31771bbd597216a1e98dd354a02..16e5a0a0f5ce63bb59bc314a1f35eede2fbaba73 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -25,11 +25,13 @@ export SRCDIR TOPSRCDIR LN_S
 AC_bdb=@BUILD_BDB@
 AC_hdb=@BUILD_HDB@
 AC_ldbm=@BUILD_LDBM@
+AC_ldap=ldap@BUILD_LDAP@
+AC_meta=meta@BUILD_META@
 AC_MONITOR=@BUILD_MONITOR@
 AC_CACHE=@BUILD_CACHE@
 AC_WITH_TLS=@WITH_TLS@
 
-export AC_MONITOR AC_CACHE AC_WITH_TLS
+export AC_MONITOR AC_CACHE AC_WITH_TLS AC_ldap AC_meta
 
 if test ! -x ../servers/slapd/slapd ; then
        echo "Could not locate slapd(8)"

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 9c51238e29b7c352d61f6ed17bf7b348a0793f4a..81f4b42f3ae92c5c07eb68b8f4a9055df0d2f44b 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -17,12 +17,11 @@ if [ x"$MONITORDB" = x"yes" ] ; then
 else
        MON=nomonitor
 fi
-if [ x"$BACKENDTYPE" = x"mod" ]; then
-       MODULELOAD="moduleload  back_${BACKEND}.la"
-fi
 sed -e "s/@BACKEND@/${BACKEND}/"       \
-       -e "s/@MODULELOAD@/${MODULELOAD}/" \
        -e "s/^#${BACKEND}#//"                  \
+       -e "s/^#${BACKENDTYPE}#//"                      \
+       -e "s/^#${AC_ldap}#//"                  \
+       -e "s/^#${AC_meta}#//"                  \
        -e "s/^#${MON}#//"                              \
        -e "s/@CACHETTL@/${CACHETTL}/"   \
        -e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"