[patch] patch for openafs 1.6.0 to compile against heimdal >= 1.4.1

openafs-1.6.0-heimdal-1.4.1.patch (text/plain), 1.68 KB, created by Andrew Hamilton on 2012-02-07 01:51:33 UTC

--- configure.ac	2011-08-16 08:26:14.000000000 -0400
+++ configure.ac	2012-02-06 20:07:54.125282528 -0500
@@ -65,11 +65,12 @@
         krb5_principal_get_comp_string])
      AC_CHECK_FUNCS([krb5_524_convert_creds], ,
          [AC_CHECK_FUNCS([krb524_convert_creds_kdc], ,
-             [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],
-                 [LIBS="-lkrb524 $LIBS"
-                  KRB5_LIBS="-lkrb524 $KRB5_LIBS"
-                  AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], 1,
-                     [Define to 1 if you have the `krb524_convert_creds_kdc' function.])])])])
+	     [AC_CHECK_FUNCS([krb5_524_conv_principal], ,
+            	[AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],
+                	[LIBS="-lkrb524 $LIBS"
+                 	KRB5_LIBS="-lkrb524 $KRB5_LIBS"
+                 	AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], 1,
+                    	[Define to 1 if you have the `krb524_convert_creds_kdc' function.])])])])])
      AC_CHECK_HEADERS([kerberosIV/krb.h])
      AC_CHECK_HEADERS([kerberosV/heim_err.h])
      AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.session,

--- src/aklog/aklog.c	2011-08-16 08:26:14.000000000 -0400
+++ src/aklog/aklog.c	2012-02-06 20:20:35.947475695 -0500
@@ -244,9 +244,9 @@
 
 #ifdef AFS_DARWIN110_ENV
 #define HAVE_NO_KRB5_524 /* MITKerberosShim logs but returns success */
-#elif !defined(HAVE_KRB5_524_CONVERT_CREDS) && defined(HAVE_KRB524_CONVERT_CREDS_KDC)
+#elif defined(HAVE_KRB5_524_CONVERT_CREDS) && defined(HAVE_KRB524_CONVERT_CREDS_KDC)
 #define krb5_524_convert_creds krb524_convert_creds_kdc
-#elif !defined(HAVE_KRB5_524_CONVERT_CREDS) && !defined(HAVE_KRB524_CONVERT_CREDS_KDC)
+#else
 #define HAVE_NO_KRB5_524
 #endif