DEVEL15-krb5-klog-solaris-20071123

FIXES 77575

make this work on solaris

(cherry picked from commit aa5c3518df8d73c2b0aa625e77179f33df97c2af)

diff --git a/src/aklog/klog.c b/src/aklog/klog.c
index e0c78be..40f1e31 100644 (file)
--- a/src/aklog/klog.c
+++ b/src/aklog/klog.c
@@ -604,9 +604,11 @@ CommandProc(struct cmd_syndesc *as, char *arock)
                what = "getting default ccache";
                code = krb5_cc_default(k5context, &cc);
            } else {
+#ifdef HAVE_KRB5_CC_REGISTER
                what = "krb5_cc_register";
                code = krb5_cc_register(k5context, &krb5_mcc_ops, FALSE);
                if (code && code != KRB5_CC_TYPE_EXISTS) goto Failed;
+#endif
                what = "krb5_cc_resolve";
                code = krb5_cc_resolve(k5context, "MEMORY:core", &cc);
                if (code) goto Failed;

diff --git a/src/cf/kerberos.m4 b/src/cf/kerberos.m4
index d526e14..fe3c439 100644 (file)
--- a/src/cf/kerberos.m4
+++ b/src/cf/kerberos.m4
@@ -58,7 +58,7 @@ if test X$conf_krb5 = XYES; then
        CPPFLAGS="$CPPFLAGS $KRB5CFLAGS"
        save_LIBS="$LIBS"
        LIBS="$LIBS $KRB5LIBS"
-       AC_CHECK_FUNCS([add_to_error_table add_error_table krb5_princ_size krb5_principal_get_comp_string encode_krb5_enc_tkt_part encode_krb5_ticket krb5_c_encrypt krb5_c_encrypt_length])
+       AC_CHECK_FUNCS([add_to_error_table add_error_table krb5_princ_size krb5_principal_get_comp_string encode_krb5_enc_tkt_part encode_krb5_ticket krb5_c_encrypt krb5_c_encrypt_length krb5_cc_register])
        AC_CHECK_FUNCS([krb5_524_convert_creds], ,
            [AC_CHECK_FUNCS([krb524_convert_creds_kdc], ,
                [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],
@@ -103,6 +103,10 @@ dnl        AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.session],,, [#include <krb
        LIBS="$save_LIBS"
 fi
 
+if test "x$ac_cv_krb5_cc_register_exists" = "xyes"; then
+        AC_DEFINE(HAVE_KRB5_CC_REGISTER, 1, [define if krb5_cc_register exists])
+fi
+
 AC_SUBST(BUILD_KRB5)
 AC_SUBST(KRB5CFLAGS)
 AC_SUBST(KRB5LIBS)