diff options
| author | Stefan Metzmacher <metze@samba.org> | 2019-01-24 02:31:10 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-01-29 22:09:07 +0100 |
| commit | 8061983d4882f3ba3f12da71443b035d7b672eec (patch) | |
| tree | 5a0b1c92c054b28fcbcc4047f0749883083595d6 /wscript | |
| parent | 60b062d614ecf8fa97b3efc0e587d3ee55e4971b (diff) | |
| download | samba-8061983d4882f3ba3f12da71443b035d7b672eec.tar.gz | |
wscript: separate embedded_heimdal from system_heimdal
This allows to default (embedded_heimdal) to build even with a
broken krb5-config file from Heimdal.
In the system_heimdal case we parse the content of krb5-config
instead of just executing it. This fails on FreeBSD 12 as
krb5-config contains iso-8859-1 characters, which can't be parsed
as unicode python buffers when using python3.
Fixing the system_heimdal case is a task for another day,
I guess it will only work once we imported a current heimdal version
and actually tested the system_heimdal case.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -246,14 +246,11 @@ def configure(conf): 'hx509', 'wind', 'gssapi', 'hcrypto', 'krb5', 'heimbase', 'asn1_compile', 'compile_et', 'kdc', 'hdb', 'heimntlm') + conf.PROCESS_SEPARATE_RULE('system_heimdal') + + if not conf.CONFIG_GET('KRB5_VENDOR'): + conf.PROCESS_SEPARATE_RULE('embedded_heimdal') - # Only process heimdal_build for non-MIT KRB5 builds - # When MIT KRB5 checks are done as above, conf.env.KRB5_VENDOR will be set - # to the lowcased output of 'krb5-config --vendor'. - # If it is not set or the output is 'heimdal', we are dealing with - # system-provided or embedded Heimdal build - if conf.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'): - conf.RECURSE('source4/heimdal_build') conf.RECURSE('source4/lib/tls') conf.RECURSE('source4/dsdb/samdb/ldb_modules') conf.RECURSE('source4/ntvfs/sysdep') |