diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2022-10-12 13:55:51 +1300 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2022-10-25 10:31:33 +0000 |
| commit | ec456766d53da45c9d3edcb382569768cbef60dd (patch) | |
| tree | c7cbc4559efab1fe2ce991d5abc29555a06f2b6b /third_party | |
| parent | cd48f2da59f48caa20e7ac652c958182671e804b (diff) | |
| download | samba-ec456766d53da45c9d3edcb382569768cbef60dd.tar.gz | |
CVE-2022-3437 third_party/heimdal_build: Add gssapi-subsystem subsystem
This allows us to access (and so test) functions internal to GSSAPI by
depending on this subsystem.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15134
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/heimdal_build/wscript_build | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/third_party/heimdal_build/wscript_build b/third_party/heimdal_build/wscript_build index fc136bc4116..a3bc4792329 100644 --- a/third_party/heimdal_build/wscript_build +++ b/third_party/heimdal_build/wscript_build @@ -633,15 +633,21 @@ if not bld.CONFIG_SET("USING_SYSTEM_GSSAPI"): ../heimdal_build/gssapi-glue.c ''' - HEIMDAL_LIBRARY('gssapi', + HEIMDAL_SUBSYSTEM('gssapi-subsystem', HEIMDAL_GSSAPI_SPNEGO_SOURCE + HEIMDAL_GSSAPI_KRB5_SOURCE + HEIMDAL_GSSAPI_MECH_SOURCE, - includes='../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech ../heimdal/lib/ntlm', - deps='hcrypto asn1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 roken krb5 com_err wind heimbase', - cflags=bld.env.HEIMDAL_UNPICKY_WNO_STRICT_OVERFLOW_CFLAGS, - version_script='lib/gssapi/version-script.map', - ) + includes='../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech ../heimdal/lib/ntlm', + deps='hcrypto asn1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 roken krb5 com_err wind heimbase', + cflags=bld.env.HEIMDAL_UNPICKY_WNO_STRICT_OVERFLOW_CFLAGS, + ) + + HEIMDAL_LIBRARY('gssapi', + '', + includes='../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech ../heimdal/lib/ntlm', + deps='gssapi-subsystem', + version_script='lib/gssapi/version-script.map', + ) if not bld.CONFIG_SET("USING_SYSTEM_KRB5"): # expand_path.c needs some of the install paths |