s4:heimdal_build: define HAVE_GSS_KRB5_CRED_{SKIP_TRANSIT_CHECK,ITERATE_ACCEPTOR_KEYT...

We can only do that for our own copy of heimdal, see
https://github.com/heimdal/heimdal/pull/656

In future we may want to use
source4/heimdal_build/wscript_configure only for
our in tree copy of heimdal and do real configure
checks for the system heimdal build.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12907
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14125

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/third_party/heimdal_build/wscript_configure b/third_party/heimdal_build/wscript_configure
index 0021cd328ecf7ac112605b29462f557e4ef7f639..52a6269c286e5a8c8377880144c65b8ab08bae2d 100644 (file)
--- a/third_party/heimdal_build/wscript_configure
+++ b/third_party/heimdal_build/wscript_configure
@@ -9,7 +9,7 @@
 # compile_et might not generate the expected code, etc).
 
 import sys
-from waflib import Logs
+from waflib import Logs, Options
 
 conf.CHECK_TYPE('u_char', 'uint8_t')
 conf.CHECK_TYPE('u_int32_t', 'uint32_t')
@@ -124,6 +124,11 @@ conf.define('HAVE_GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT', 1)
 conf.define('HAVE_GSS_IMPORT_CRED', 1)
 conf.define('HAVE_GSS_EXPORT_CRED', 1)
 conf.define('HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X', 1)
+if not Options.options.with_system_heimdalkrb5:
+    # these are Samba only for now
+    # see https://github.com/heimdal/heimdal/pull/656
+    conf.define('HAVE_GSS_KRB5_CRED_SKIP_TRANSIT_CHECK_X', 1)
+    conf.define('HAVE_GSS_KRB5_CRED_ITERATE_ACCEPTOR_KEYTAB_X', 1)
 conf.define('HAVE_GSSAPI', 1)
 conf.define('HAVE_ADDR_TYPE_IN_KRB5_ADDRESS', 1)
 conf.define('HAVE_CHECKSUM_IN_KRB5_CHECKSUM', 1)