sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4:kerberos: adjust smb_krb5_debug_wrapper() to embedded heimdal

Browse Source 
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>
This commit is contained in:
Andrew Bartlett 2021-12-08 15:30:12 +13:00 committed by Joseph Sutton
parent 52ccce259d
commit 6395cbe32b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/auth/kerberos/krb5_init_context.c
View File

@ -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));
}

4
source4/heimdal_build/wscript_configure
View File

@ -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