[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-2934-g0c2fd68
Volker Lendecke
vlendec at samba.org
Sat Jun 21 10:06:50 GMT 2008
The branch, v3-3-test has been updated
via 0c2fd687b25e32d446ef799927db6933bc61223d (commit)
from 829b1ad4697f2f1ea008377d591456722dccd025 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 0c2fd687b25e32d446ef799927db6933bc61223d
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 20 14:30:02 2008 +0200
Use "init_shared_module" instead of "init_module" for initializing .so's
-----------------------------------------------------------------------
Summary of changes:
source/lib/ldb/common/ldb_modules.c | 6 ++++--
source/lib/module.c | 6 +++---
source/m4/aclocal.m4 | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/ldb/common/ldb_modules.c b/source/lib/ldb/common/ldb_modules.c
index d898f3d..71a0220 100644
--- a/source/lib/ldb/common/ldb_modules.c
+++ b/source/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/source/lib/module.c b/source/lib/module.c
index 285bd9c..dee0623 100644
--- a/source/lib/module.c
+++ b/source/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/source/m4/aclocal.m4 b/source/m4/aclocal.m4
index 48cdacc..71b3b69 100644
--- a/source/m4/aclocal.m4
+++ b/source/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]
--
Samba Shared Repository
More information about the samba-cvs
mailing list