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/rpc_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/rpc_server')
| -rw-r--r-- | source4/rpc_server/common/server_info.c | 1 | ||||
| -rw-r--r-- | source4/rpc_server/wkssvc/dcesrv_wkssvc.c | 1 | ||||
| -rwxr-xr-x | source4/rpc_server/wscript_build | 18 |
3 files changed, 11 insertions, 9 deletions
diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c index e23b108e9d9..39c75cc49a4 100644 --- a/source4/rpc_server/common/server_info.c +++ b/source4/rpc_server/common/server_info.c @@ -26,7 +26,6 @@ #include "auth/auth.h" #include "param/param.h" #include "rpc_server/common/common.h" -#include "rpc_server/common/share.h" #include "libds/common/roles.h" /* diff --git a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c index 80a518c17c5..baae0e3b16b 100644 --- a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c +++ b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c @@ -24,7 +24,6 @@ #include "librpc/gen_ndr/ndr_wkssvc.h" #include "librpc/gen_ndr/ndr_srvsvc.h" #include "rpc_server/common/common.h" -#include "rpc_server/common/share.h" #include "param/param.h" /* diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index aaf3d26ee1a..b9de1fb9a75 100755 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -1,14 +1,14 @@ #!/usr/bin/env python bld.SAMBA_SUBSYSTEM('DCERPC_SHARE', - source='common/server_info.c common/share_info.c', + source='common/share_info.c', autoproto='common/share.h', deps='ldb', - enabled=bld.AD_DC_BUILD_IS_ENABLED() + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER'), ) bld.SAMBA_SUBSYSTEM('DCERPC_COMMON', - source='common/forward.c common/reply.c dcesrv_auth.c common/loadparm.c', + source='common/server_info.c common/forward.c common/reply.c dcesrv_auth.c common/loadparm.c', autoproto='common/proto.h', deps='ldb DCERPC_SHARE samba_server_gensec', enabled=bld.AD_DC_BUILD_IS_ENABLED() @@ -54,7 +54,8 @@ bld.SAMBA_MODULE('dcerpc_srvsvc', autoproto='srvsvc/proto.h', subsystem='dcerpc_server', init_function='dcerpc_server_srvsvc_init', - deps='DCERPC_COMMON NDR_SRVSVC share ntvfs' + deps='DCERPC_COMMON NDR_SRVSVC share ntvfs', + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') ) @@ -88,7 +89,8 @@ bld.SAMBA_MODULE('dcerpc_winreg', subsystem='dcerpc_server', init_function='dcerpc_server_winreg_init', deps='registry ndr-standard', - internal_module=True + internal_module=True, + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') ) @@ -132,7 +134,8 @@ bld.SAMBA_MODULE('dcerpc_spoolss', subsystem='dcerpc_server', init_function='dcerpc_server_spoolss_init', deps='DCERPC_COMMON NDR_SPOOLSS ntptr RPC_NDR_SPOOLSS', - internal_module=True + internal_module=True, + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') ) @@ -155,7 +158,8 @@ bld.SAMBA_MODULE('dcerpc_eventlog', source='eventlog/dcesrv_eventlog6.c', subsystem='dcerpc_server', init_function='dcerpc_server_eventlog6_init', - deps='DCERPC_COMMON' + deps='DCERPC_COMMON', + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') ) bld.SAMBA_MODULE('dcerpc_dnsserver', |