svn commit: samba r7285 - in branches/SAMBA_4_0/source/auth/kerberos: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-06-04 22:27:33 +0000 (Sat, 04 Jun 2005)
New Revision: 7285

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7285

Log:
It appears that MIT Kerberos does not have the log redirection
facility that I'm using. This should let us compile the non-KDC
components on MIT again.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c
   branches/SAMBA_4_0/source/auth/kerberos/config.m4
   branches/SAMBA_4_0/source/auth/kerberos/kerberos.h


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c	2005-06-04 21:24:10 UTC (rev 7284)
+++ branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c	2005-06-04 22:27:33 UTC (rev 7285)
@@ -484,7 +484,7 @@
 	return 0;
 }
 
-#if defined(HAVE_KRB5_INITLOG) && defined(HAVE_KRB5_ADDLOG_FUNC) && defined(HAVE_KRB5_FREELOG)
+#ifdef HAVE_KRB5_LOGGING_CONTROL
 static int smb_krb5_context_destory_2(void *ptr) 
 {
 	struct smb_krb5_context *ctx = ptr;
@@ -547,7 +547,7 @@
 		}
 	}
 
-#if defined(HAVE_KRB5_INITLOG) && defined(HAVE_KRB5_ADDLOG_FUNC) && defined(HAVE_KRB5_FREELOG)
+#ifdef HAVE_KRB5_LOGGING_CONTROL
 	/* TODO: Should we have a different name here? */
 	ret = krb5_initlog((*smb_krb5_context)->krb5_context, "Samba", &(*smb_krb5_context)->logf);
 	

Modified: branches/SAMBA_4_0/source/auth/kerberos/config.m4
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/config.m4	2005-06-04 21:24:10 UTC (rev 7284)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.m4	2005-06-04 22:27:33 UTC (rev 7285)
@@ -263,9 +263,22 @@
 	AC_CHECK_FUNC_EXT(krb5_initlog, $KRB5_LIBS)
 	AC_CHECK_FUNC_EXT(krb5_freelog, $KRB5_LIBS)
 	AC_CHECK_FUNC_EXT(krb5_addlog_func, $KRB5_LIBS)
+	AC_CHECK_FUNC_EXT(krb5_set_warn_dest, $KRB5_LIBS)
 
 	LIBS="$LIBS $KRB5_LIBS"
   
+	AC_CACHE_CHECK([for krb5_log_facility type],
+                samba_cv_HAVE_KRB5_LOG_FACILITY,[
+	AC_TRY_COMPILE([#include <krb5.h>],
+		[krb5_log_facility block;],
+		samba_cv_HAVE_KRB5_LOG_FACILITY=yes,
+		samba_cv_HAVE_KRB5_LOG_FACILITY=no)])
+
+	if test x"$samba_cv_HAVE_KRB5_LOG_FACILITY" = x"yes"; then
+		AC_DEFINE(HAVE_KRB5_LOG_FACILITY,1,
+		[Whether the type krb5_log_facility exists])
+	fi
+
 	AC_CACHE_CHECK([for krb5_encrypt_block type],
                 samba_cv_HAVE_KRB5_ENCRYPT_BLOCK,[
 	AC_TRY_COMPILE([#include <krb5.h>],

Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos.h
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos.h	2005-06-04 21:24:10 UTC (rev 7284)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos.h	2005-06-04 22:27:33 UTC (rev 7285)
@@ -21,9 +21,17 @@
 
 #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
+#else
+#undef HAVE_KRB5_LOGGGING_CONTROL
+#endif
+
 struct smb_krb5_context {
 	krb5_context krb5_context;
+#ifdef HAVE_KRB5_LOGGGING_CONTROL
 	krb5_log_facility *logf;
+#endif
 };