diff options
| author | Andreas Schneider <asn@samba.org> | 2019-04-29 11:05:07 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-04-30 23:18:27 +0000 |
| commit | e35a8598c6b123cb64bff6946b80acdf48ad2eec (patch) | |
| tree | 609d5e5249a42adee4c9ff2b34c7258fc2ffa705 | |
| parent | 324a2eec8675b18c6f0e85a1f7f7dbccb4524189 (diff) | |
| download | samba-e35a8598c6b123cb64bff6946b80acdf48ad2eec.tar.gz | |
waf: Add check for gnutls_x509_crt_set_subject_unique_id()
This is used by the GnuTLS backupkey implementation.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/rpc_server/wscript_build | 2 | ||||
| -rw-r--r-- | source4/torture/wscript_build | 2 | ||||
| -rw-r--r-- | wscript_configure_system_gnutls | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index ece71b6adae..a101846cdf2 100644 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -119,7 +119,7 @@ bld.SAMBA_MODULE('dcerpc_lsarpc', ) -if bld.CONFIG_SET('HAVE_GNUTLS_3_4_7'): +if bld.CONFIG_SET('HAVE_GNUTLS_X509_CRT_SET_SUBJECT_UNIQUE_ID'): bld.SAMBA_MODULE('dcerpc_backupkey', source='backupkey/dcesrv_backupkey.c ', autoproto='backupkey/proto.h', diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index 0189300aca9..97b36a1f3a5 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -83,7 +83,7 @@ bld.SAMBA_SUBSYSTEM('IREMOTEWINSPOOL_COMMON', torture_rpc_backupkey = '' if bld.AD_DC_BUILD_IS_ENABLED(): - if bld.CONFIG_SET('HAVE_GNUTLS_3_4_7'): + if 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' diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls index f46cf31eca3..85b1277d2ee 100644 --- a/wscript_configure_system_gnutls +++ b/wscript_configure_system_gnutls @@ -20,6 +20,9 @@ conf.CHECK_CFG(package='gnutls', # Define gnutls as a system library conf.SET_TARGET_TYPE('gnutls', 'SYSLIB') +# 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 conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls') |