[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2617-g1b12e5f

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  1b12e5f9ed28ac57c06d9597a8f3c57cde01beef (commit)
      from  4a996476297963d4cb300b4d45c23e83a493c339 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 1b12e5f9ed28ac57c06d9597a8f3c57cde01beef
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jun 23 07:14:46 2008 +0200

    init_shared_module -> init_samba_module

-----------------------------------------------------------------------

Summary of changes:
 source/exports/modules-darwin.syms  |    2 +-
 source/lib/ldb/common/ldb_modules.c |    4 ++--
 source/lib/module.c                 |    4 ++--
 source/m4/aclocal.m4                |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/exports/modules-darwin.syms b/source/exports/modules-darwin.syms
index 1bc8661..be45761 100644
--- 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 71a0220..fa7f685 100644
--- 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;
 	}
 
-	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/source/lib/module.c b/source/lib/module.c
index dee0623..2e56e8e 100644
--- 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;
 	}
 
-	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/source/m4/aclocal.m4 b/source/m4/aclocal.m4
index 71b3b69..69bf95e 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_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]


-- 
Samba Shared Repository