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>

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index eabee7a7664e7f5485df58b1f7ec6ed9c6482948..8980fdfe58d26490bf17ec335f7200e2ca13eac1 100755 (executable)
--- 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 69538579c81b6ee2a7a71fe28e198f6a88dcecd0..fd12bb1ecafa3c853ca315dcad1015ccdb011373 100644 (file)
--- 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);
 }