summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-06-23 07:14:46 +0200
committerVolker Lendecke <vl@samba.org>2008-06-23 07:20:18 +0200
commit993d80fd22b7c0a6e2eec5ab899f51e077c529cb (patch)
tree8d55e3506838c14e82cba17f15ffdcae273bcedb
parent13ebf889b39e0b71f1f98198b0d003f5461d42a6 (diff)
downloadsamba-993d80fd22b7c0a6e2eec5ab899f51e077c529cb.tar.gz
samba-993d80fd22b7c0a6e2eec5ab899f51e077c529cb.tar.bz2
samba-993d80fd22b7c0a6e2eec5ab899f51e077c529cb.zip
init_shared_module -> init_samba_module
(This used to be commit 9b174871a87677f7dfbd897a80e526f203906bea)
-rw-r--r--source3/exports/modules-darwin.syms2
-rw-r--r--source3/lib/ldb/common/ldb_modules.c4
-rw-r--r--source3/lib/module.c4
-rw-r--r--source3/m4/aclocal.m42
4 files changed, 6 insertions, 6 deletions
diff --git a/source3/exports/modules-darwin.syms b/source3/exports/modules-darwin.syms
index 1bc866111b..be457614d8 100644
--- a/source3/exports/modules-darwin.syms
+++ b/source3/exports/modules-darwin.syms
@@ -1 +1 @@
-_init_shared_module
+_init_samba_module
diff --git a/source3/lib/ldb/common/ldb_modules.c b/source3/lib/ldb/common/ldb_modules.c
index 71a0220501..fa7f685d97 100644
--- a/source3/lib/ldb/common/ldb_modules.c
+++ b/source3/lib/ldb/common/ldb_modules.c
@@ -231,11 +231,11 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
return -1;
}
- init_fn = (int (*)(void))dlsym(handle, "init_shared_module");
+ init_fn = (int (*)(void))dlsym(handle, "init_samba_module");
if (init_fn == NULL) {
ldb_debug(ldb, LDB_DEBUG_ERROR, "no symbol "
- "`init_shared_module' found in %s: %s\n", path,
+ "`init_samba_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 dee0623094..2e56e8e8b9 100644
--- a/source3/lib/module.c
+++ b/source3/lib/module.c
@@ -49,13 +49,13 @@ 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_shared_module");
+ init = (init_module_function *)sys_dlsym(handle, "init_samba_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_shared_module' "
+ DEBUG(0, ("Error trying to resolve symbol 'init_samba_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 71b3b69656..69bf95ef31 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_shared_module], [Whether to build $1 as shared module])
+ AC_DEFINE([$1][_init], [init_samba_module], [Whether to build $1 as shared module])
$4_MODULES="$$4_MODULES $3"
AC_MSG_RESULT([shared])
[$6]