From 285e873b51fc5608d764b98269b8d3d85c2c7841 Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Thu, 5 Jan 2023 18:13:09 +0100 Subject: CVE-2022-38023 s4:rpc_server:wscript: Reformat following pycodestyle BUG: https://bugzilla.samba.org/show_bug.cgi?id=15240 Signed-off-by: Samuel Cabrero Reviewed-by: Andreas Schneider (cherry picked from commit d9e6b490db3ead7e79bb3ff0c1f9ef8ab8bdc65b) --- source4/rpc_server/wscript_build | 290 +++++++++++++++++++++++---------------- 1 file changed, 168 insertions(+), 122 deletions(-) diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index 8c756721232..e7bb773d719 100644 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -1,174 +1,220 @@ #!/usr/bin/env python bld.SAMBA_SUBSYSTEM('DCERPC_SHARE', - source='common/share_info.c', - autoproto='common/share.h', - deps='ldb share', - enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER'), - ) + source='common/share_info.c', + autoproto='common/share.h', + deps='ldb share', + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER'), + ) bld.SAMBA_SUBSYSTEM('DCERPC_COMMON', - source='common/server_info.c common/forward.c common/loadparm.c', - autoproto='common/proto.h', - deps='ldb DCERPC_SHARE', - enabled=bld.AD_DC_BUILD_IS_ENABLED() - ) + source=''' + common/server_info.c + common/forward.c + common/loadparm.c + ''', + autoproto='common/proto.h', + deps='ldb DCERPC_SHARE', + enabled=bld.AD_DC_BUILD_IS_ENABLED() + ) bld.SAMBA_LIBRARY('dcerpc_server', - source='dcerpc_server.c', - pc_files='dcerpc_server.pc', - deps='LIBCLI_AUTH ndr samba_server_gensec service auth', - public_deps='dcerpc dcerpc-server-core', - autoproto='dcerpc_server_proto.h', - public_headers='dcerpc_server.h', - vnum='0.0.1', - enabled=bld.AD_DC_BUILD_IS_ENABLED() - ) + source='dcerpc_server.c', + pc_files='dcerpc_server.pc', + deps='LIBCLI_AUTH ndr samba_server_gensec service auth', + public_deps='dcerpc dcerpc-server-core', + autoproto='dcerpc_server_proto.h', + public_headers='dcerpc_server.h', + vnum='0.0.1', + enabled=bld.AD_DC_BUILD_IS_ENABLED() + ) bld.SAMBA_MODULE('dcerpc_rpcecho', - source='echo/rpc_echo.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_rpcecho_init', - deps='ndr-standard events' - ) + source='echo/rpc_echo.c', + subsystem='dcerpc_server', + init_function='dcerpc_server_rpcecho_init', + deps='ndr-standard events' + ) bld.SAMBA_MODULE('dcerpc_epmapper', - source='epmapper/rpc_epmapper.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_epmapper_init', - deps='NDR_EPMAPPER' - ) + source='epmapper/rpc_epmapper.c', + subsystem='dcerpc_server', + init_function='dcerpc_server_epmapper_init', + deps='NDR_EPMAPPER' + ) bld.SAMBA_MODULE('dcerpc_remote', - source='remote/dcesrv_remote.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_remote_init', - deps='LIBCLI_SMB ndr-table' - ) + source='remote/dcesrv_remote.c', + subsystem='dcerpc_server', + init_function='dcerpc_server_remote_init', + deps='LIBCLI_SMB ndr-table' + ) bld.SAMBA_MODULE('dcerpc_srvsvc', - source='srvsvc/dcesrv_srvsvc.c srvsvc/srvsvc_ntvfs.c', - autoproto='srvsvc/proto.h', - subsystem='dcerpc_server', - init_function='dcerpc_server_srvsvc_init', - deps='DCERPC_COMMON NDR_SRVSVC share ntvfs', - enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') - ) + source='srvsvc/dcesrv_srvsvc.c srvsvc/srvsvc_ntvfs.c', + autoproto='srvsvc/proto.h', + subsystem='dcerpc_server', + init_function='dcerpc_server_srvsvc_init', + deps='DCERPC_COMMON NDR_SRVSVC share ntvfs', + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') + ) bld.SAMBA_MODULE('dcerpc_wkssvc', - source='wkssvc/dcesrv_wkssvc.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_wkssvc_init', - deps='DCERPC_COMMON ndr-standard' - ) + source='wkssvc/dcesrv_wkssvc.c', + subsystem='dcerpc_server', + init_function='dcerpc_server_wkssvc_init', + deps='DCERPC_COMMON ndr-standard' + ) bld.SAMBA_MODULE('dcerpc_unixinfo', - source='unixinfo/dcesrv_unixinfo.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_unixinfo_init', - deps='DCERPC_COMMON samdb NDR_UNIXINFO LIBWBCLIENT_OLD' - ) + source='unixinfo/dcesrv_unixinfo.c', + subsystem='dcerpc_server', + init_function='dcerpc_server_unixinfo_init', + deps='DCERPC_COMMON samdb NDR_UNIXINFO LIBWBCLIENT_OLD' + ) bld.SAMBA_MODULE('dcesrv_samr', - source='samr/dcesrv_samr.c samr/samr_password.c', - autoproto='samr/proto.h', - subsystem='dcerpc_server', - init_function='dcerpc_server_samr_init', - deps='samdb DCERPC_COMMON ndr-standard auth4_sam GNUTLS_HELPERS DCERPC_HELPER' - ) + source='samr/dcesrv_samr.c samr/samr_password.c', + autoproto='samr/proto.h', + subsystem='dcerpc_server', + init_function='dcerpc_server_samr_init', + deps=''' + samdb + DCERPC_COMMON + ndr-standard + auth4_sam + GNUTLS_HELPERS + DCERPC_HELPER + ''' + ) bld.SAMBA_MODULE('dcerpc_winreg', - source='winreg/rpc_winreg.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_winreg_init', - deps='registry ndr-standard', - internal_module=True, - enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') - ) + source='winreg/rpc_winreg.c', + subsystem='dcerpc_server', + init_function='dcerpc_server_winreg_init', + deps='registry ndr-standard', + internal_module=True, + enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER') + ) bld.SAMBA_MODULE('dcerpc_netlogon', - source='netlogon/dcerpc_netlogon.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_netlogon_init', - deps='''DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNEL ndr-standard auth4_sam samba-hostconfig DSDB_MODULE_HELPERS - util_str_escape''' - ) + source='netlogon/dcerpc_netlogon.c', + subsystem='dcerpc_server', + init_function='dcerpc_server_netlogon_init', + deps=''' + DCERPC_COMMON + RPC_NDR_IRPC + COMMON_SCHANNEL + ndr-standard + auth4_sam + samba-hostconfig + DSDB_MODULE_HELPERS + util_str_escape + ''' + ) bld.SAMBA_MODULE('dcerpc_lsarpc', - source='lsa/dcesrv_lsa.c lsa/lsa_init.c lsa/lsa_lookup.c', - autoproto='lsa/proto.h', - subsystem='dcerpc_server', - init_function='dcerpc_server_lsa_init', - deps='samdb DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err samba-security UTIL_LSARPC' - ) + source='lsa/dcesrv_lsa.c lsa/lsa_init.c lsa/lsa_lookup.c', + autoproto='lsa/proto.h', + subsystem='dcerpc_server', + init_function='dcerpc_server_lsa_init', + deps=''' + samdb + DCERPC_COMMON + ndr-standard + LIBCLI_AUTH + NDR_DSSETUP + com_err + samba-security + UTIL_LSARPC + ''' + ) bld.SAMBA_MODULE('dcerpc_backupkey', - source='backupkey/dcesrv_backupkey.c ', - autoproto='backupkey/proto.h', - subsystem='dcerpc_server', - init_function='dcerpc_server_backupkey_init', - deps='samdb DCERPC_COMMON NDR_BACKUPKEY RPC_NDR_BACKUPKEY gnutls GNUTLS_HELPERS', - ) + source='backupkey/dcesrv_backupkey.c ', + autoproto='backupkey/proto.h', + subsystem='dcerpc_server', + init_function='dcerpc_server_backupkey_init', + deps=''' + samdb + DCERPC_COMMON + NDR_BACKUPKEY + RPC_NDR_BACKUPKEY + gnutls + GNUTLS_HELPERS + ''', + ) bld.SAMBA_MODULE('dcerpc_drsuapi', - source='drsuapi/dcesrv_drsuapi.c drsuapi/updaterefs.c drsuapi/getncchanges.c drsuapi/addentry.c drsuapi/writespn.c drsuapi/drsutil.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_drsuapi_init', - deps='samdb DCERPC_COMMON NDR_DRSUAPI samba-security' - ) + source=''' + drsuapi/dcesrv_drsuapi.c + drsuapi/updaterefs.c + drsuapi/getncchanges.c + drsuapi/addentry.c + drsuapi/writespn.c + drsuapi/drsutil.c + ''', + subsystem='dcerpc_server', + init_function='dcerpc_server_drsuapi_init', + deps='samdb DCERPC_COMMON NDR_DRSUAPI samba-security' + ) bld.SAMBA_MODULE('dcerpc_browser', - source='browser/dcesrv_browser.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_browser_init', - deps='DCERPC_COMMON NDR_BROWSER' - ) + source='browser/dcesrv_browser.c', + subsystem='dcerpc_server', + init_function='dcerpc_server_browser_init', + deps='DCERPC_COMMON NDR_BROWSER' + ) bld.SAMBA_MODULE('dcerpc_eventlog', - source='eventlog/dcesrv_eventlog6.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_eventlog6_init', - deps='DCERPC_COMMON' - ) + source='eventlog/dcesrv_eventlog6.c', + subsystem='dcerpc_server', + init_function='dcerpc_server_eventlog6_init', + deps='DCERPC_COMMON' + ) bld.SAMBA_MODULE('dcerpc_dnsserver', - source='dnsserver/dcerpc_dnsserver.c dnsserver/dnsutils.c dnsserver/dnsdata.c dnsserver/dnsdb.c', - subsystem='dcerpc_server', - init_function='dcerpc_server_dnsserver_init', - deps='DCERPC_COMMON dnsserver_common netif' - ) + source=''' + dnsserver/dcerpc_dnsserver.c + dnsserver/dnsutils.c + dnsserver/dnsdata.c + dnsserver/dnsdb.c + ''', + subsystem='dcerpc_server', + init_function='dcerpc_server_dnsserver_init', + deps='DCERPC_COMMON dnsserver_common netif' + ) bld.SAMBA_MODULE('service_dcerpc', - source='service_rpc.c', - autoproto='service_rpc.h', - subsystem='service', - init_function='server_service_rpc_init', - internal_module=False, - deps='dcerpc_server' - ) - -bld.SAMBA_BINARY( - 'test_rpc_dns_server_dnsutils', - source='tests/rpc_dns_server_dnsutils_test.c', - deps=''' - dnsserver_common - dcerpc_server - cmocka - talloc - ''', - for_selftest=True, - enabled=bld.AD_DC_BUILD_IS_ENABLED() -) + source='service_rpc.c', + autoproto='service_rpc.h', + subsystem='service', + init_function='server_service_rpc_init', + internal_module=False, + deps='dcerpc_server' + ) + +bld.SAMBA_BINARY('test_rpc_dns_server_dnsutils', + source='tests/rpc_dns_server_dnsutils_test.c', + deps=''' + dnsserver_common + dcerpc_server + cmocka + talloc + ''', + for_selftest=True, + enabled=bld.AD_DC_BUILD_IS_ENABLED() + ) -- cgit v1.2.1