diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-01 15:27:30 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-01 18:55:19 +1100 |
| commit | 43f7c9ca26f72141c87babe428e46e9a293c4b9c (patch) | |
| tree | dd9e39fb83d1d2b693d30f1ce16da20df38bda41 | |
| parent | 6db57658a9746df7177f1824752aa43395f1419f (diff) | |
| download | samba-43f7c9ca26f72141c87babe428e46e9a293c4b9c.tar.gz samba-43f7c9ca26f72141c87babe428e46e9a293c4b9c.tar.bz2 samba-43f7c9ca26f72141c87babe428e46e9a293c4b9c.zip | |
s4-test: we don't need to set LDB_MODULES_PATH any more
| -rwxr-xr-x | selftest/selftest.pl | 1 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/test-controls.sh | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 2 | ||||
| -rw-r--r-- | source4/scripting/devel/selftest-vars.sh | 1 |
4 files changed, 0 insertions, 6 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 96ca3b1ee7..0087ec1060 100755 --- 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 868e8c2377..771085ec60 100755 --- 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 0f60e8f31b..83de6ed456 100644 --- 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 ca99ced3f7..38e8a40acb 100644 --- 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 |