diff options
| -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); } |