From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 5 Nov 2007 22:09:12 +0000 (+0000)
Subject: aklog-no-kimpersonate-in-more-cases-20071105
X-Git-Tag: BP-openafs-windows-kdfs-ifs~376
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=e06a144f33347bcac29131cd450d828c2803b9c0

aklog-no-kimpersonate-in-more-cases-20071105


aix's NAS kerberos can't support kimpersonate. deal
---

diff --git a/src/aklog/aklog_main.c b/src/aklog/aklog_main.c
index abae5f5..9ae0953 100644
--- a/src/aklog/aklog_main.c
+++ b/src/aklog/aklog_main.c
@@ -198,7 +198,7 @@ static int get_user_realm(krb5_context, char *);
 #error "Must have either krb5_princ_size or krb5_principal_get_comp_string"
 #endif
 
-#if !defined(HAVE_KRB5_ENCRYPT_TKT_PART) && defined(HAVE_ENCODE_KRB5_ENC_TKT_PART)
+#if !defined(HAVE_KRB5_ENCRYPT_TKT_PART) && defined(HAVE_ENCODE_KRB5_ENC_TKT_PART) && defined(HAVE_KRB5_C_ENCRYPT) 
 krb5_error_code
 krb5_encrypt_tkt_part(krb5_context context,
 		      const krb5_keyblock *key,
@@ -1689,7 +1689,7 @@ static krb5_error_code get_credv5_akimpersonate(krb5_context context,
 						int *paddress,
 						krb5_creds** out_creds /* out */ )
 {
-#if defined(USING_HEIMDAL) || (defined(HAVE_ENCODE_KRB5_ENC_TKT) && defined(HAVE_ENCODE_KRB5_TICKET))
+#if defined(USING_HEIMDAL) || (defined(HAVE_ENCODE_KRB5_ENC_TKT) && defined(HAVE_ENCODE_KRB5_TICKET) && defined(HAVE_KRB5_C_ENCRYPT))
     krb5_error_code code;
     krb5_keytab kt = 0;
     krb5_kt_cursor cursor[1];
diff --git a/src/cf/kerberos.m4 b/src/cf/kerberos.m4
index 72e9092..d526e14 100644
--- 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])
+	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([krb5_524_convert_creds], ,
 	    [AC_CHECK_FUNCS([krb524_convert_creds_kdc], ,
 		[AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],