s4:kerberos: adjust smb_krb5_debug_wrapper() to embedded heimdal

In future we need a real configure check for Heimdal 8.

NOTE: THIS COMMIT WON'T COMPILE/WORK ON ITS OWN!

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index 616eebc968e819841e4e7f53c65a7e72e6d631d5..5252c5b7598553912e5cb718a2c392674ee47580 100644 (file)
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -74,7 +74,11 @@ static void smb_krb5_debug_close(void *private_data) {
 #endif
 
 #ifdef SAMBA4_USES_HEIMDAL
-static void smb_krb5_debug_wrapper(const char *timestr, const char *msg, void *private_data)
+static void smb_krb5_debug_wrapper(
+#ifdef HAVE_KRB5_ADDLOG_FUNC_NEED_CONTEXT
+               krb5_context ctx,
+#endif /* HAVE_KRB5_ADDLOG_FUNC_NEED_CONTEXT */
+               const char *timestr, const char *msg, void *private_data)
 {
        DEBUGC(DBGC_KERBEROS, 3, ("Kerberos: %s\n", msg));
 }

diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index f9d251d84ef22532f89ff6b70f9a8bcc71fbbe22..023935d98c0d64b26916cdf97b7588f49810267c 100644 (file)
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -202,3 +202,7 @@ conf.define('HAVE_KRB5_PRINCIPAL_GET_TYPE', 1)
 conf.define('HAVE_KRB5_WARNX', 1)
 conf.define('HAVE_KRB5_PROMPT_TYPE', 1)
 
+if conf.CONFIG_SET('USING_EMBEDDED_HEIMDAL'):
+    conf.define('HAVE_KRB5_ADDLOG_FUNC_NEED_CONTEXT', 1)
+else:
+    pass # TODO