summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/common
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-21 08:32:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:59:00 -0500
commit07bdbd4592ecae2325a3456fe9d9700e6c256b64 (patch)
tree40016c83512dbe1bd327b91cf1235834fa3406b1 /source4/lib/ldb/common
parent59c427963f1e445012f8bb78ca46d2ec317e2caf (diff)
downloadsamba-07bdbd4592ecae2325a3456fe9d9700e6c256b64.tar.gz
samba-07bdbd4592ecae2325a3456fe9d9700e6c256b64.tar.bz2
samba-07bdbd4592ecae2325a3456fe9d9700e6c256b64.zip
r14606: Fix paths in developer mode. This allows 'make quicktest' to work when
building with --enable-dso (This used to be commit 614f062748d95a455d1a99a7444fdc0fe152f4e4)
Diffstat (limited to 'source4/lib/ldb/common')
-rw-r--r--source4/lib/ldb/common/ldb_modules.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 6ba5fbbc20..bc27d1ed1b 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -38,6 +38,7 @@
#ifdef _SAMBA_BUILD_
#include "build.h"
+#include "dynconfig.h"
#endif
#define LDB_MODULE_PREFIX "modules:"
@@ -202,7 +203,11 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
int (*init_fn) (void);
#ifdef HAVE_DLOPEN
+#ifdef _SAMBA_BUILD_
+ path = talloc_asprintf(ldb, "%s/ldb/%s.%s", dyn_MODULESDIR, name, dyn_SHLIBEXT);
+#else
path = talloc_asprintf(ldb, "%s/%s.%s", MODULESDIR, name, SHLIBEXT);
+#endif
ldb_debug(ldb, LDB_DEBUG_TRACE, "trying to load %s from %s\n", name, path);