s4:heimdal: import lorikeet-heimdal-200903260854 (commit 8f3b61e3fb466bb9dd457ae88ee0...

[metze/samba/wip.git] / source4 / heimdal / lib / krb5 / creds.c

diff --git a/source4/heimdal/lib/krb5/creds.c b/source4/heimdal/lib/krb5/creds.c
index 087a4850eba145cc46c137706f2e36dc9abc3931..b91a5605b4efe763b9494b6cf72fc5a8fd74bcc0 100644 (file)
--- a/source4/heimdal/lib/krb5/creds.c
+++ b/source4/heimdal/lib/krb5/creds.c
@@ -35,15 +35,15 @@
 
 RCSID("$Id$");
 
-#undef __attribute__
-#define __attribute__(X)
+#undef KRB5_DEPRECATED
+#define KRB5_DEPRECATED
 
 #ifndef HEIMDAL_SMALLER
 
 /* keep this for compatibility with older code */
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_free_creds_contents (krb5_context context, krb5_creds *c)
-    __attribute__((deprecated))
+    KRB5_DEPRECATED
 {
     return krb5_free_cred_contents (context, c);
 }
@@ -235,9 +235,7 @@ krb5_compare_creds(krb5_context context, krb5_flags whichfields,
     }
        
     if (match && (whichfields & KRB5_TC_MATCH_KEYTYPE))
-       match = krb5_enctypes_compatible_keys(context,
-                                             mcreds->session.keytype,
-                                             creds->session.keytype);
+        match = mcreds->session.keytype == creds->session.keytype;
 
     if (match && (whichfields & KRB5_TC_MATCH_FLAGS_EXACT))
        match = mcreds->flags.i == creds->flags.i;