1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-22 05:57:43 +03:00

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>
This commit is contained in:
Andrew Tridgell 2010-10-30 11:29:49 +11:00
parent 256349d827
commit ac8e910686
2 changed files with 2 additions and 3 deletions

View File

@ -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) = @_;

View File

@ -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);
}