sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

Use "init_shared_module" instead of "init_module" for initializing .so's

Browse Source
This commit is contained in:
Volker Lendecke 2008-06-20 14:30:02 +02:00
parent 829b1ad469
commit 0c2fd687b2
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/lib/ldb/common/ldb_modules.c
View File

@ -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;
}

6
source/lib/module.c
View File

@ -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;
}

2
source/m4/aclocal.m4 vendored
View File

@ -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]