s4-test: we don't need to set LDB_MODULES_PATH any more

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 96ca3b1ee7453cfc771fec22a7638449bb252997..0087ec106044b129c0de86543b2193e93e635f79 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -420,7 +420,6 @@ $ENV{EXEEXT} = $exeext;
 
 my $tls_enabled = not $opt_quick;
 $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
-$ENV{LDB_MODULES_PATH} = "$bindir_abs/modules/ldb";
 
 sub prefix_pathvar($$)
 {

diff --git a/source4/lib/ldb/tests/test-controls.sh b/source4/lib/ldb/tests/test-controls.sh
index 868e8c2377c908244bb765a669019401966cfec8..771085ec606706db693ab859a69eca3ee4ae2da6 100755 (executable)
--- a/source4/lib/ldb/tests/test-controls.sh
+++ b/source4/lib/ldb/tests/test-controls.sh
@@ -11,8 +11,6 @@ PATH=bin:$PATH
 export PATH
 
 rm -f $LDB_URL*
-LDB_MODULES_PATH=`dirname $0`/../../../bin/modules/testldb
-echo $LDB_MODULES_PATH
 
 echo "LDB_URL: $LDB_URL"
 cat <<EOF | $VALGRIND ldbadd || exit 1

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 0f60e8f31bd803b319c4ddc03c04a29ae01849f4..83de6ed456da33ce10eab4419353d1e726e80cea 100644 (file)
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -318,8 +318,6 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb,
 
        if (options.modules_path != NULL) {
                ldb_set_modules_dir(ldb, options.modules_path);
-       } else if (getenv("LDB_MODULES_PATH") != NULL) {
-               ldb_set_modules_dir(ldb, getenv("LDB_MODULES_PATH"));
        }
 
        /* now connect to the ldb */

diff --git a/source4/scripting/devel/selftest-vars.sh b/source4/scripting/devel/selftest-vars.sh
index ca99ced3f78c7c5fd2459dd2ff72eef7331a4119..38e8a40acbd48f860caab75a36a2cb67a9370a33 100644 (file)
--- a/source4/scripting/devel/selftest-vars.sh
+++ b/source4/scripting/devel/selftest-vars.sh
@@ -42,6 +42,5 @@ export DC_SERVER=localdc1
 export DC_PASSWORD=locDCpass1
 export PYTHONPATH=$PWD/bin/python
 export PASSWORD=locDCpass1
-export LDB_MODULES_PATH=$PWD/bin/modules/ldb
 export NETBIOSALIAS=localdc
 export SMB_CONF_PATH=$PWD/st/dc/etc/smb.conf