diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/smb_server/smb/wscript_build | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb2/wscript_build | 2 | ||||
| -rw-r--r-- | source4/smb_server/wscript_build | 4 | ||||
| -rw-r--r-- | source4/torture/rpc/rpc.c | 2 | ||||
| -rwxr-xr-x | source4/torture/wscript_build | 14 |
5 files changed, 13 insertions, 11 deletions
diff --git a/source4/smb_server/smb/wscript_build b/source4/smb_server/smb/wscript_build index a17de06e637..3e3df21431d 100644 --- a/source4/smb_server/smb/wscript_build +++ b/source4/smb_server/smb/wscript_build @@ -5,6 +5,6 @@ bld.SAMBA_SUBSYSTEM('SMB_PROTOCOL', autoproto='smb_proto.h', deps='dfs_server_ad', public_deps='ntvfs LIBPACKET samba-credentials samba_server_gensec', - enabled=bld.AD_DC_BUILD_IS_ENABLED() + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') ) diff --git a/source4/smb_server/smb2/wscript_build b/source4/smb_server/smb2/wscript_build index 18a2b29b9f0..7866ee93949 100644 --- a/source4/smb_server/smb2/wscript_build +++ b/source4/smb_server/smb2/wscript_build @@ -4,6 +4,6 @@ bld.SAMBA_SUBSYSTEM('SMB2_PROTOCOL', source='receive.c negprot.c sesssetup.c tcon.c fileio.c fileinfo.c find.c keepalive.c', autoproto='smb2_proto.h', public_deps='ntvfs LIBPACKET LIBCLI_SMB2 samba_server_gensec NDR_DFSBLOBS', - enabled=bld.AD_DC_BUILD_IS_ENABLED() + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') ) diff --git a/source4/smb_server/wscript_build b/source4/smb_server/wscript_build index bfeba0e468a..78298d9e9f2 100644 --- a/source4/smb_server/wscript_build +++ b/source4/smb_server/wscript_build @@ -7,14 +7,14 @@ bld.SAMBA_MODULE('service_smb', init_function='server_service_smb_init', deps='SMB_SERVER netif shares samba-hostconfig', internal_module=False, - enabled=bld.AD_DC_BUILD_IS_ENABLED() + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') ) bld.SAMBA_SUBSYSTEM('SMB_SERVER', source='handle.c tcon.c session.c blob.c management.c smb_server.c', autoproto='smb_server_proto.h', public_deps='share LIBPACKET SMB_PROTOCOL SMB2_PROTOCOL', - enabled=bld.AD_DC_BUILD_IS_ENABLED() + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') ) bld.RECURSE('smb') diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index e70fac52fee..aa16242d466 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -489,7 +489,7 @@ NTSTATUS torture_rpc_init(void) torture_suite_add_suite(suite, torture_rpc_object_uuid(suite)); torture_suite_add_suite(suite, torture_rpc_winreg(suite)); torture_suite_add_suite(suite, torture_rpc_spoolss(suite)); -#ifdef AD_DC_BUILD_IS_ENABLED +#ifdef WITH_NTVFS_FILESERVER torture_suite_add_suite(suite, torture_rpc_spoolss_notify(suite)); #endif torture_suite_add_suite(suite, torture_rpc_spoolss_win(suite)); diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index a7a14fd15cc..0a5c5ccaf79 100755 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -32,11 +32,13 @@ bld.RECURSE('winbind') bld.RECURSE('libnetapi') bld.RECURSE('libsmbclient') -heimdal_specific = dict(source='', deps='') +ntvfs_specific = dict(source='', deps='') -if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'): - heimdal_specific['source'] += ' rpc/spoolss_notify.c' - heimdal_specific['deps'] += ' SMB_SERVER dcerpc_server ntvfs' +# Yes, the spoolss_notify test uses the NTVFS file server to run the SMB server expected +# to handle the RPC callback! +if bld.CONFIG_SET('WITH_NTVFS_FILESERVER'): + ntvfs_specific['source'] += ' rpc/spoolss_notify.c' + ntvfs_specific['deps'] += ' SMB_SERVER dcerpc_server ntvfs' bld.SAMBA_SUBSYSTEM('TORTURE_NDR', source='''ndr/ndr.c @@ -119,7 +121,7 @@ bld.SAMBA_MODULE('torture_rpc', rpc/clusapi.c rpc/witness.c rpc/backupkey.c - ''' + heimdal_specific['source'], + ''' + ntvfs_specific['source'], autoproto='rpc/proto.h', subsystem='smbtorture', init_function='torture_rpc_init', @@ -165,7 +167,7 @@ bld.SAMBA_MODULE('torture_rpc', RPC_NDR_CLUSAPI RPC_NDR_WITNESS RPC_NDR_BACKUPKEY - ''' + heimdal_specific['deps'], + ''' + ntvfs_specific['deps'], internal_module=True) bld.RECURSE('drs') |