summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-11 01:53:11 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-11 01:53:11 +0200
commit7c7de11f20c5330c40c24d341056fb92806bbf37 (patch)
treeb931109a276f2010d15dfb4b9421485306965e4c
parent670122d724ff190d886a8eca86b6eeff64592708 (diff)
downloadsamba-7c7de11f20c5330c40c24d341056fb92806bbf37.tar.gz
samba-7c7de11f20c5330c40c24d341056fb92806bbf37.tar.bz2
samba-7c7de11f20c5330c40c24d341056fb92806bbf37.zip
Fix LDB module initialization when using external ldb.
(This used to be commit b7b4aff8b52742d69526dc0ef5da2fe3c05e3af8)
-rw-r--r--source4/build/smb_build/makefile.pm2
-rw-r--r--source4/ntvfs/sysdep/sys_lease.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 495c8fb967..16709aef41 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/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/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c
index e6b11c450a..a0322bbcc1 100644
--- a/source4/ntvfs/sysdep/sys_lease.c
+++ b/source4/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;