sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4-rpc_server: Remove Heimdal-based BackupKey server

Browse Source 
We rely on a modern GnuTLS now.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Andrew Bartlett 2019-07-31 16:13:38 +12:00 committed by Andreas Schneider
parent 974cebdf95
commit 52b91cb33c
5 changed files with 8 additions and 4052 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1861
source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
View File

File diff suppressed because it is too large Load Diff

10
source4/rpc_server/wscript_build
View File

@ -119,8 +119,6 @@ bld.SAMBA_MODULE('dcerpc_lsarpc',
) )
if (bld.CONFIG_SET('HAVE_GNUTLS_PRIVKEY_EXPORT_X509') and
bld.CONFIG_SET('HAVE_GNUTLS_X509_CRT_SET_SUBJECT_UNIQUE_ID')):
bld.SAMBA_MODULE('dcerpc_backupkey', bld.SAMBA_MODULE('dcerpc_backupkey',
source='backupkey/dcesrv_backupkey.c ', source='backupkey/dcesrv_backupkey.c ',
autoproto='backupkey/proto.h', autoproto='backupkey/proto.h',
@ -128,14 +126,6 @@ if (bld.CONFIG_SET('HAVE_GNUTLS_PRIVKEY_EXPORT_X509') and
init_function='dcerpc_server_backupkey_init', init_function='dcerpc_server_backupkey_init',
deps='samdb DCERPC_COMMON NDR_BACKUPKEY RPC_NDR_BACKUPKEY gnutls', deps='samdb DCERPC_COMMON NDR_BACKUPKEY RPC_NDR_BACKUPKEY gnutls',
) )
else:
bld.SAMBA_MODULE('dcerpc_backupkey',
source='backupkey/dcesrv_backupkey_heimdal.c ',
autoproto='backupkey/proto.h',
subsystem='dcerpc_server',
init_function='dcerpc_server_backupkey_init',
deps='samdb DCERPC_COMMON NDR_BACKUPKEY RPC_NDR_BACKUPKEY krb5 hx509 hcrypto gnutls DCERPC_COMMON',
)
bld.SAMBA_MODULE('dcerpc_drsuapi', bld.SAMBA_MODULE('dcerpc_drsuapi',

2160
source4/torture/rpc/backupkey_heimdal.c
View File

File diff suppressed because it is too large Load Diff

9
source4/torture/wscript_build
View File

@ -82,13 +82,6 @@ bld.SAMBA_SUBSYSTEM('IREMOTEWINSPOOL_COMMON',
deps='talloc', deps='talloc',
enabled=bld.PYTHON_BUILD_IS_ENABLED()) enabled=bld.PYTHON_BUILD_IS_ENABLED())
torture_rpc_backupkey = ''
if bld.AD_DC_BUILD_IS_ENABLED():
if (bld.CONFIG_SET('HAVE_GNUTLS_PRIVKEY_EXPORT_X509') and
bld.CONFIG_SET('HAVE_GNUTLS_X509_CRT_SET_SUBJECT_UNIQUE_ID')):
torture_rpc_backupkey = 'rpc/backupkey.c'
else:
torture_rpc_backupkey = 'rpc/backupkey_heimdal.c'
bld.SAMBA_MODULE('torture_rpc', bld.SAMBA_MODULE('torture_rpc',
source=''' source='''
rpc/join.c rpc/join.c
@ -146,7 +139,7 @@ bld.SAMBA_MODULE('torture_rpc',
rpc/iremotewinspool.c rpc/iremotewinspool.c
rpc/iremotewinspool_driver.c rpc/iremotewinspool_driver.c
rpc/mdssvc.c rpc/mdssvc.c
''' + torture_rpc_backupkey + ntvfs_specific['source'], rpc/backupkey.c''' + ntvfs_specific['source'],
autoproto='rpc/proto.h', autoproto='rpc/proto.h',
subsystem='smbtorture', subsystem='smbtorture',
init_function='torture_rpc_init', init_function='torture_rpc_init',

6
wscript_configure_system_gnutls
View File

@ -12,12 +12,6 @@ conf.CHECK_CFG(package='gnutls',
# Define gnutls as a system library # Define gnutls as a system library
conf.SET_TARGET_TYPE('gnutls', 'SYSLIB') conf.SET_TARGET_TYPE('gnutls', 'SYSLIB')
# Check for gnutls_privkey_export_x509 (>= 3.4.0) required by backupkey
conf.CHECK_FUNCS_IN('gnutls_privkey_export_x509', 'gnutls')
# Check for gnutls_x509_crt_set_subject_unique_id (>= 3.4.7) required by backupkey
conf.CHECK_FUNCS_IN('gnutls_x509_crt_set_subject_unique_id', 'gnutls')
# Check for gnutls_pkcs7_get_embedded_data_oid (>= 3.5.5) required by libmscat # Check for gnutls_pkcs7_get_embedded_data_oid (>= 3.5.5) required by libmscat
conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls') conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')