diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-30 11:29:49 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-30 23:49:01 +1100 |
| commit | ac8e9106862fc4d49c070d3d307f43df9d7cc842 (patch) | |
| tree | 567b12fc764ac5f8fc47ffc30ee0aee269bc9b5d | |
| parent | 256349d827517eba15ee4d0fbae725eace352c64 (diff) | |
| download | samba-ac8e9106862fc4d49c070d3d307f43df9d7cc842.tar.gz samba-ac8e9106862fc4d49c070d3d307f43df9d7cc842.tar.bz2 samba-ac8e9106862fc4d49c070d3d307f43df9d7cc842.zip | |
s4-modules: remove LD_SAMBA_MODULE_PATH
this isn't needed now that we automatically get the module path right
in our build and install trees
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rwxr-xr-x | selftest/selftest.pl | 2 | ||||
| -rw-r--r-- | source4/param/util.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index eabee7a766..8980fdfe58 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -421,7 +421,7 @@ $ENV{EXEEXT} = $exeext; my $tls_enabled = not $opt_quick; $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no"); $ENV{LDB_MODULES_PATH} = "$bindir_abs/modules/ldb"; -$ENV{LD_SAMBA_MODULE_PATH} = "$bindir_abs/modules"; + sub prefix_pathvar($$) { my ($name, $newpath) = @_; diff --git a/source4/param/util.c b/source4/param/util.c index 69538579c8..fd12bb1eca 100644 --- a/source4/param/util.c +++ b/source4/param/util.c @@ -269,9 +269,8 @@ bool run_init_functions(init_module_fn *fns) static char *modules_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, const char *name) { - const char *env_moduledir = getenv("LD_SAMBA_MODULE_PATH"); return talloc_asprintf(mem_ctx, "%s/%s", - env_moduledir?env_moduledir:lpcfg_modulesdir(lp_ctx), + lpcfg_modulesdir(lp_ctx), name); } |