STABLE14-krb5-aklog-kimpersonate-conditionalize-20070920

make kimpersonate conitional

(cherry picked from commit a0fa3b559836d134c44eae20cbd6d7d1d04a0d10)

diff --git a/src/aklog/aklog_main.c b/src/aklog/aklog_main.c
index 6a6e05467c1df8bc4075732afae4e439a9b4cb71..08c1f494a6e119f64e99ab63f62488525b44de1f 100644 (file)
--- a/src/aklog/aklog_main.c
+++ b/src/aklog/aklog_main.c
@@ -199,7 +199,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)
+#if !defined(HAVE_KRB5_ENCRYPT_TKT_PART) && defined(HAVE_ENCODE_KRB5_ENC_TKT_PART)
 krb5_error_code
 krb5_encrypt_tkt_part(krb5_context context,
                      const krb5_keyblock *key,
@@ -1690,6 +1690,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))
     krb5_error_code code;
     krb5_keytab kt = 0;
     krb5_kt_cursor cursor[1];
@@ -1994,8 +1995,12 @@ cleanup:
     krb5_free_keyblock_contents(context, session_key);
 out:
     return code;
+#else
+    return -1;
+#endif
 }
 
+
 static krb5_error_code get_credv5(krb5_context context, 
                                  char *name, char *inst, char *realm,
                                  krb5_creds **creds)

diff --git a/src/cf/kerberos.m4 b/src/cf/kerberos.m4
index 0ee0838c35c1d3204a08e2871bc4b8e6e6badca1..72e9092746b70abe3d16eb986a7cf93fd0d4c5fb 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])
+       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([krb5_524_convert_creds], ,
            [AC_CHECK_FUNCS([krb524_convert_creds_kdc], ,
                [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index ceb15ac840621d57c330b52b4b0d4f4e28b39f0c..e0646de436440200c4f02bd8fadb1de867c7f561 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -461,6 +461,7 @@ case $AFS_SYSNAME in
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
+               RANLIB="ranlib -c"
                ;;
 
        *_darwin_90)
@@ -478,6 +479,7 @@ case $AFS_SYSNAME in
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
+               RANLIB="ranlib -c"
                ;;
 
        ppc_linux*)