From 8107bdec7b451fbb980c0cc22e61501cd76545e6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 5 Jun 2005 13:41:32 +0000 Subject: r7306: Use a consistant #define for detecting support for the Heimdal krb5 log redirection code. Andrew Bartlett (This used to be commit 93335d587d9f48c46d9c3b91237f649693cf3003) --- source4/auth/kerberos/clikrb5.c | 4 ++-- source4/auth/kerberos/kerberos.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/auth/kerberos') diff --git a/source4/auth/kerberos/clikrb5.c b/source4/auth/kerberos/clikrb5.c index 3858b694a7..431c5cde76 100644 --- a/source4/auth/kerberos/clikrb5.c +++ b/source4/auth/kerberos/clikrb5.c @@ -484,7 +484,7 @@ static int smb_krb5_context_destory_1(void *ptr) return 0; } -#ifdef HAVE_KRB5_LOGGING_CONTROL +#ifdef HAVE_KRB5_LOG_CONTROL static int smb_krb5_context_destory_2(void *ptr) { struct smb_krb5_context *ctx = ptr; @@ -547,7 +547,7 @@ static void smb_krb5_debug_wrapper(const char *timestr, const char *msg, void *p } } -#ifdef HAVE_KRB5_LOGGING_CONTROL +#ifdef HAVE_KRB5_LOG_CONTROL /* TODO: Should we have a different name here? */ ret = krb5_initlog((*smb_krb5_context)->krb5_context, "Samba", &(*smb_krb5_context)->logf); diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h index 286e8ceb2e..3e5ad4c502 100644 --- a/source4/auth/kerberos/kerberos.h +++ b/source4/auth/kerberos/kerberos.h @@ -22,14 +22,14 @@ #if defined(HAVE_KRB5) #if defined(HAVE_KRB5_INITLOG) && defined(HAVE_KRB5_ADDLOG_FUNC) && defined(HAVE_KRB5_FREELOG) && defined (HAVE_KRB5_SET_WARN_DEST) && defined(HAVE_KRB5_LOG_FACILITY) -#define HAVE_KRB5_LOGGGING_CONTROL +#define HAVE_KRB5_LOG_CONTROL #else -#undef HAVE_KRB5_LOGGGING_CONTROL +#undef HAVE_KRB5_LOG_CONTROL #endif struct smb_krb5_context { krb5_context krb5_context; -#ifdef HAVE_KRB5_LOGGGING_CONTROL +#ifdef HAVE_KRB5_LOG_CONTROL krb5_log_facility *logf; #endif }; -- cgit