diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2016-05-11 05:33:17 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2016-06-02 16:36:15 +0200 |
| commit | 0b4c741b9c03d147ee5f56d027bacda75c1b5282 (patch) | |
| tree | 4393e6168e5d09970e74aafe0cf2ef0451e6c344 /source4/smb_server | |
| parent | 90665713ab96b22cdd1ff344575b05253aa1afc2 (diff) | |
| download | samba-0b4c741b9c03d147ee5f56d027bacda75c1b5282.tar.gz | |
build: Build less of Samba when building --without-ntvfs-fileserver
We would build, but not use, many components of the NTVFS file server
even when we asked not to. They would then consume disk, but not be
of any use
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/service_smb.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/wscript_build | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/smb_server/service_smb.c b/source4/smb_server/service_smb.c index 0e4897c7358..05004b009c9 100644 --- a/source4/smb_server/service_smb.c +++ b/source4/smb_server/service_smb.c @@ -34,7 +34,8 @@ #include "dsdb/samdb/samdb.h" #include "param/param.h" #include "file_server/file_server.h" - +#include "ntvfs/ntvfs.h" +#include "lib/cmdline/popt_common.h" /* open the smb server sockets */ @@ -86,6 +87,7 @@ failed: /* called at smbd startup - register ourselves as a server service */ NTSTATUS server_service_smb_init(void) { + ntvfs_init(cmdline_lp_ctx); share_init(); return register_server_service("smb", smbsrv_task_init); } diff --git a/source4/smb_server/wscript_build b/source4/smb_server/wscript_build index 78298d9e9f2..58603407c0f 100644 --- a/source4/smb_server/wscript_build +++ b/source4/smb_server/wscript_build @@ -5,7 +5,7 @@ bld.SAMBA_MODULE('service_smb', autoproto='service_smb_proto.h', subsystem='service', init_function='server_service_smb_init', - deps='SMB_SERVER netif shares samba-hostconfig', + deps='SMB_SERVER netif shares samba-hostconfig POPT_SAMBA', internal_module=False, enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') ) |