diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-20 14:30:02 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-06-21 11:25:41 +0200 |
| commit | 3cf5395ad56bc32974de9f7284e9584825df2704 (patch) | |
| tree | 389865c1431ee4dbad752d92582f5c86514b2557 | |
| parent | df905a5d77037eaffe5f52edd26409152b740068 (diff) | |
| download | samba-3cf5395ad56bc32974de9f7284e9584825df2704.tar.gz samba-3cf5395ad56bc32974de9f7284e9584825df2704.tar.bz2 samba-3cf5395ad56bc32974de9f7284e9584825df2704.zip | |
Use "init_shared_module" instead of "init_module" for initializing .so's
(This used to be commit 0c2fd687b25e32d446ef799927db6933bc61223d)
| -rw-r--r-- | source3/lib/ldb/common/ldb_modules.c | 6 | ||||
| -rw-r--r-- | source3/lib/module.c | 6 | ||||
| -rw-r--r-- | source3/m4/aclocal.m4 | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source3/lib/ldb/common/ldb_modules.c b/source3/lib/ldb/common/ldb_modules.c index d898f3df03..71a0220501 100644 --- a/source3/lib/ldb/common/ldb_modules.c +++ b/source3/lib/ldb/common/ldb_modules.c @@ -231,10 +231,12 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name) return -1; } - init_fn = (int (*)(void))dlsym(handle, "init_module"); + init_fn = (int (*)(void))dlsym(handle, "init_shared_module"); if (init_fn == NULL) { - ldb_debug(ldb, LDB_DEBUG_ERROR, "no symbol `init_module' found in %s: %s\n", path, dlerror()); + ldb_debug(ldb, LDB_DEBUG_ERROR, "no symbol " + "`init_shared_module' found in %s: %s\n", path, + dlerror()); dlclose(handle); return -1; } diff --git a/source3/lib/module.c b/source3/lib/module.c index 285bd9c4c0..dee0623094 100644 --- a/source3/lib/module.c +++ b/source3/lib/module.c @@ -49,14 +49,14 @@ static NTSTATUS do_smb_load_module(const char *module_name, bool is_probe) return NT_STATUS_UNSUCCESSFUL; } - init = (init_module_function *)sys_dlsym(handle, "init_module"); + init = (init_module_function *)sys_dlsym(handle, "init_shared_module"); /* we must check sys_dlerror() to determine if it worked, because sys_dlsym() can validly return NULL */ error = sys_dlerror(); if (error) { - DEBUG(0, ("Error trying to resolve symbol 'init_module' in %s: %s\n", - module_name, error)); + DEBUG(0, ("Error trying to resolve symbol 'init_shared_module' " + "in %s: %s\n", module_name, error)); sys_dlclose(handle); return NT_STATUS_UNSUCCESSFUL; } diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4 index 48cdacc9c8..71b3b69656 100644 --- a/source3/m4/aclocal.m4 +++ b/source3/m4/aclocal.m4 @@ -25,7 +25,7 @@ AC_DEFUN(SMB_MODULE, fi if test x"$DEST" = xSHARED; then - AC_DEFINE([$1][_init], [init_module], [Whether to build $1 as shared module]) + AC_DEFINE([$1][_init], [init_shared_module], [Whether to build $1 as shared module]) $4_MODULES="$$4_MODULES $3" AC_MSG_RESULT([shared]) [$6] |