init_shared_module -> init_samba_module

diff --git a/source/exports/modules-darwin.syms b/source/exports/modules-darwin.syms
index 1bc866111b6703737bb9ce2a4c2819e4d4e2f785..be457614d80260186aad12b6f4e4ccabcbd8be16 100644 (file)
--- a/source/exports/modules-darwin.syms
+++ b/source/exports/modules-darwin.syms
@@ -1 +1 @@
-_init_shared_module
+_init_samba_module

diff --git a/source/lib/ldb/common/ldb_modules.c b/source/lib/ldb/common/ldb_modules.c
index 71a02205019c6bf998be789d2e7da21d04a3645c..fa7f685d97dcc16568b45a04e0ab0a07eb54b260 100644 (file)
--- a/source/lib/ldb/common/ldb_modules.c
+++ b/source/lib/ldb/common/ldb_modules.c
@@ -231,11 +231,11 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
                return -1;
        }
 
                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 "
 
        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;
                          dlerror());
                dlclose(handle);
                return -1;

diff --git a/source/lib/module.c b/source/lib/module.c
index dee0623094e85639d77e6c1f9d3e884afbc20c44..2e56e8e8b960097188ac3284f0dcc70f0d8e107b 100644 (file)
--- a/source/lib/module.c
+++ b/source/lib/module.c
@@ -49,13 +49,13 @@ static NTSTATUS do_smb_load_module(const char *module_name, bool is_probe)
                return NT_STATUS_UNSUCCESSFUL;
        }
 
                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) {
 
        /* 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;
                          "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 71b3b6965671316c902251c0918baadd80464631..69bf95ef31055e6f3ba291fcb54a21a74529fbd2 100644 (file)
--- 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
        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]
                $4_MODULES="$$4_MODULES $3"
                AC_MSG_RESULT([shared])
                [$6]