From 4780c2bac774ca76ba4322065155dc773613d468 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 18 Apr 2008 14:56:43 +0000
Subject: [PATCH] STABLE14-klog-aix-missing-symbols-20080418

LICENSE IPL10

aix's krb5 isn't heimdal or mit. it has dangling symbols. yay!


(cherry picked from commit f3056feadbd6866bddc20e040b5005baeb4c8cad)
---
 src/aklog/klog.c   | 16 +++++++---------
 src/cf/kerberos.m4 |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/aklog/klog.c b/src/aklog/klog.c
index f75dbac10..573be06dc 100644
--- a/src/aklog/klog.c
+++ b/src/aklog/klog.c
@@ -309,26 +309,24 @@ klog_prompter(krb5_context context,
 {
     krb5_error_code code;
     int i, type;
-#ifndef USING_HEIMDAL
+#if !defined(USING_HEIMDAL) && defined(HAVE_KRB5_GET_PROMPT_TYPES)
     krb5_prompt_type *types;
 #endif
     struct kp_arg *kparg = (struct kp_arg *) a;
     code = krb5_prompter_posix(context, a, name, banner, num_prompts, prompts);
     if (code) return code;
-#ifndef USING_HEIMDAL
+#if !defined(USING_HEIMDAL) && defined(HAVE_KRB5_GET_PROMPT_TYPES)
     if ((types = krb5_get_prompt_types(context)))
 #endif
     for (i = 0; i < num_prompts; ++i) {
-#ifdef USING_HEIMDAL
-	type = prompts[i].type;
-#else
+#if !defined(USING_HEIMDAL) && defined(HAVE_KRB5_GET_PROMPT_TYPES)
 	type = types[i];
+#else
+	type = prompts[i].type;
 #endif
 #if 0
-	printf ("i%d t%d <%.*s>\n", i,
-type,
-prompts[i].reply->length,
-prompts[i].reply->data);
+	printf ("i%d t%d <%.*s>\n", i, type, prompts[i].reply->length,
+		prompts[i].reply->data);
 #endif
 	switch(type) {
 	case KRB5_PROMPT_TYPE_PASSWORD:
diff --git a/src/cf/kerberos.m4 b/src/cf/kerberos.m4
index f8dda460b..9bae17af8 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 krb5_c_encrypt krb5_c_encrypt_length krb5_cc_register krb5_decode_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 krb5_cc_register krb5_decode_ticket krb5_get_prompt_types])
 	AC_CHECK_FUNCS([krb5_524_convert_creds], ,
 	    [AC_CHECK_FUNCS([krb524_convert_creds_kdc], ,
 		[AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],
-- 
2.39.5