[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1503-gb7b4aff

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  b7b4aff8b52742d69526dc0ef5da2fe3c05e3af8 (commit)
      from  d5bf4e9065303b54421a6f35b213a22f062d27d4 (commit)

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


- Log -----------------------------------------------------------------
commit b7b4aff8b52742d69526dc0ef5da2fe3c05e3af8
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun May 11 01:53:11 2008 +0200

    Fix LDB module initialization when using external ldb.

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

Summary of changes:
 source/build/smb_build/makefile.pm |    2 +-
 source/ntvfs/sysdep/sys_lease.c    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 495c8fb..16709ae 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -127,7 +127,7 @@ sub SharedModule($$)
 	$self->_prepare_list($ctx, "DEPEND_LIST");
 	$self->_prepare_list($ctx, "LINK_FLAGS");
 
-	if (defined($ctx->{INIT_FUNCTION}) and $ctx->{INIT_FUNCTION_TYPE} =~ /\(\*\)/) {
+	if (defined($ctx->{INIT_FUNCTION}) and $ctx->{INIT_FUNCTION_TYPE} =~ /\(\*\)/ and not ($ctx->{INIT_FUNCTION} =~ /\(/)) {
 		$self->output("\$($ctx->{NAME}_OBJ_FILES): CFLAGS+=-D$ctx->{INIT_FUNCTION}=init_module\n");
 	}
 
diff --git a/source/ntvfs/sysdep/sys_lease.c b/source/ntvfs/sysdep/sys_lease.c
index e6b11c4..a0322bb 100644
--- a/source/ntvfs/sysdep/sys_lease.c
+++ b/source/ntvfs/sysdep/sys_lease.c
@@ -28,7 +28,6 @@
 #include "lib/events/events.h"
 #include "lib/util/dlinklist.h"
 #include "param/param.h"
-#include "build.h"
 
 /* list of registered backends */
 static struct sys_lease_ops *backends;
@@ -109,6 +108,10 @@ _PUBLIC_ NTSTATUS sys_lease_register(const struct sys_lease_ops *backend)
 	return NT_STATUS_OK;
 }
 
+#ifndef STATIC_sys_lease_MODULES 
+#define STATIC_sys_lease_MODULES NULL
+#endif
+
 _PUBLIC_ NTSTATUS sys_lease_init(void)
 {
 	static bool initialized = false;


-- 
Samba Shared Repository