From 9b261c008a395a323e0516f4cd3f3134aa050577 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 8 Jun 2009 19:06:16 +1000 Subject: s4:heimdal: import lorikeet-heimdal-200906080040 (commit 904d0124b46eed7a8ad6e5b73e892ff34b6865ba) Also including the supporting changes required to pass make test A number of heimdal functions and constants have changed since we last imported a tree (for the better, but inconvenient for us). Andrew Bartlett --- source4/heimdal/lib/krb5/creds.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'source4/heimdal/lib/krb5/creds.c') diff --git a/source4/heimdal/lib/krb5/creds.c b/source4/heimdal/lib/krb5/creds.c index 087a4850eb..26c0dfbecb 100644 --- a/source4/heimdal/lib/krb5/creds.c +++ b/source4/heimdal/lib/krb5/creds.c @@ -33,23 +33,6 @@ #include "krb5_locl.h" -RCSID("$Id$"); - -#undef __attribute__ -#define __attribute__(X) - -#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)) -{ - return krb5_free_cred_contents (context, c); -} - -#endif /* HEIMDAL_SMALLER */ - /** * Free content of krb5_creds. * @@ -235,9 +218,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; -- cgit