From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 9 Sep 2011 12:25:43 +0000 (+1000)
Subject: modules: standardise on samba_init_module as the hook symbol to resolve
X-Git-Tag: ldb-1.1.3~60
X-Git-Url: http://git.samba.org/?p=amitay%2Fsamba.git;a=commitdiff_plain;h=355b5e3a831415d9bef97de4b2d83e353de4ab0f;hp=a718b5a4f1ebfb63aec2f43b654d8e97f099fe85

modules: standardise on samba_init_module as the hook symbol to resolve
---

diff --git a/lib/util/modules.c b/lib/util/modules.c
index 620611ff176..2c4622510ba 100644
--- a/lib/util/modules.c
+++ b/lib/util/modules.c
@@ -156,14 +156,14 @@ static NTSTATUS do_smb_load_module(const char *module_name, bool is_probe)
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-	init = (init_module_fn)dlsym(handle, "init_samba_module");
+	init = (init_module_fn)dlsym(handle, SAMBA_INIT_MODULE);
 
 	/* we must check dlerror() to determine if it worked, because
            dlsym() can validly return NULL */
 	error = dlerror();
 	if (error) {
-		DEBUG(0, ("Error trying to resolve symbol 'init_samba_module' "
-			  "in %s: %s\n", module_name, error));
+		DEBUG(0, ("Error trying to resolve symbol '" SAMBA_INIT_MODULE
+			  "' in %s: %s\n", module_name, error));
 		dlclose(handle);
 		return NT_STATUS_UNSUCCESSFUL;
 	}
diff --git a/lib/util/samba_modules.h b/lib/util/samba_modules.h
index 06f92c5db1a..ae7895eb124 100644
--- a/lib/util/samba_modules.h
+++ b/lib/util/samba_modules.h
@@ -24,7 +24,7 @@
 /* Module support */
 typedef NTSTATUS (*init_module_fn) (void);
 
-NTSTATUS init_samba_module(void);
+NTSTATUS samba_init_module(void);
 
 /* this needs to be a string which is not in the C library. We
    previously used "init_module", but that meant that modules which
diff --git a/source3/exports/modules-darwin.syms b/source3/exports/modules-darwin.syms
index be457614d80..276543b8de0 100644
--- a/source3/exports/modules-darwin.syms
+++ b/source3/exports/modules-darwin.syms
@@ -1 +1 @@
-_init_samba_module
+_samba_init_module
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index 6112a647fef..a4db42e5ca9 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_samba_module], [Whether to build $1 as shared module])
+		AC_DEFINE([$1][_init], [samba_init_module], [Whether to build $1 as shared module])
 		$4_MODULES="$$4_MODULES $3"
 		AC_MSG_RESULT([shared])
 		[$6]
diff --git a/source3/modules/perfcount_test.c b/source3/modules/perfcount_test.c
index 99904ac3da3..8d17ee513f4 100644
--- a/source3/modules/perfcount_test.c
+++ b/source3/modules/perfcount_test.c
@@ -381,7 +381,7 @@ static struct smb_perfcount_handlers perfcount_test_handlers = {
 	perfcount_test_end
 };
 
-NTSTATUS init_samba_module(void)
+NTSTATUS samba_init_module(void)
 {
 	return smb_register_perfcounter(SMB_PERFCOUNTER_INTERFACE_VERSION,
 					"pc_test", &perfcount_test_handlers);
diff --git a/source3/wscript b/source3/wscript
index 86949d258ca..d7764289d24 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1817,7 +1817,7 @@ main() {
             conf.DEFINE('static_init_%s' % p, '{}')
         if p in shared_list:
             for entry in shared_list[p]:
-                conf.DEFINE('%s_init' % entry, 'init_samba_module')
+                conf.DEFINE('%s_init' % entry, 'samba_init_module')
                 conf.env[shared_env].append('%s' % entry)
 
     if not os.getenv('TOPLEVEL_BUILD'):