diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-29 17:40:19 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:41 -0500 |
commit | 4fa24df98ded939c68bdc95e9f09334caeeb84af (patch) | |
tree | 156dfe96806880d1da7f944fff6a84ffcc045e59 /source4/param | |
parent | 535d1920f887ef98d962bcd7a40eae556f8e727f (diff) | |
download | samba-4fa24df98ded939c68bdc95e9f09334caeeb84af.tar.gz samba-4fa24df98ded939c68bdc95e9f09334caeeb84af.tar.bz2 samba-4fa24df98ded939c68bdc95e9f09334caeeb84af.zip |
r19507: Merge my DSO fixes branch. Building Samba's libraries as shared libraries
works again now, by specifying --enable-dso to configure.
(This used to be commit 7a01235067a4800b07b8919a6a475954bfb0b04c)
Diffstat (limited to 'source4/param')
-rw-r--r-- | source4/param/util.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/param/util.c b/source4/param/util.c index af97903277..2453094798 100644 --- a/source4/param/util.c +++ b/source4/param/util.c @@ -169,7 +169,10 @@ _PUBLIC_ char *smbd_tmp_path(TALLOC_CTX *mem_ctx, const char *name) static char *modules_path(TALLOC_CTX* mem_ctx, const char *name) { - return talloc_asprintf(mem_ctx, "%s/%s", lp_modulesdir(), name); + const char *env_moduledir = getenv("LD_SAMBA_MODULE_PATH"); + return talloc_asprintf(mem_ctx, "%s/%s", + env_moduledir?env_moduledir:lp_modulesdir(), + name); } /** |