diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-22 21:03:09 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-22 21:03:09 +0100 |
| commit | c023828962d7050668c38129170121cc50cd300f (patch) | |
| tree | 02e9eda98a5418cc4555c5b24ca8a1612a706c18 /source4/smbd | |
| parent | b682b0feb0af40656cd1b71a859cb1f23edcbcf5 (diff) | |
| download | samba-c023828962d7050668c38129170121cc50cd300f.tar.gz | |
Fix missing symbols issues when building with shared libraries.
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/config.mk | 1 | ||||
| -rw-r--r-- | source4/smbd/process_model.mk | 1 | ||||
| -rw-r--r-- | source4/smbd/server.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index a5f5aab65e6..26b2c447d55 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -36,5 +36,6 @@ PRIVATE_DEPENDENCIES = \ CLUSTER samba_OBJ_FILES = $(smbdsrcdir)/server.o +$(samba_OBJ_FILES): CFLAGS+=-DSTATIC_service_MODULES="$(service_INIT_FUNCTIONS)NULL" MANPAGES += $(smbdsrcdir)/samba.8 diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk index d2ef048f409..d216edd4017 100644 --- a/source4/smbd/process_model.mk +++ b/source4/smbd/process_model.mk @@ -4,6 +4,7 @@ # Start MODULE process_model_single [MODULE::process_model_single] INIT_FUNCTION = process_model_single_init +OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = process_model # End MODULE process_model_single ################################################ diff --git a/source4/smbd/server.c b/source4/smbd/server.c index fd4b21b17f9..0f6d248d822 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -200,7 +200,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ extern NTSTATUS server_service_rpc_init(void); extern NTSTATUS server_service_ntp_signd_init(void); extern NTSTATUS server_service_samba3_smb_init(void); - init_module_fn static_init[] = { STATIC_samba_MODULES }; + init_module_fn static_init[] = { STATIC_service_MODULES }; init_module_fn *shared_init; struct event_context *event_ctx; uint16_t stdin_event_flags; |