summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-02-03 14:15:40 +0100
committerGünther Deschner <gd@samba.org>2009-02-03 15:32:47 +0100
commitb0ea17973400cd15c3fb23c8deb4f9c37b42035a (patch)
tree992a1b7082e98a6702b9830957304e13990a78cc
parent3367812df604bb1d01f59ee2750427426164c519 (diff)
downloadsamba-b0ea17973400cd15c3fb23c8deb4f9c37b42035a.tar.gz
samba-b0ea17973400cd15c3fb23c8deb4f9c37b42035a.tar.bz2
samba-b0ea17973400cd15c3fb23c8deb4f9c37b42035a.zip
s3-kerberos: use KRB5_KT_KEY compat macro.
Guenther
-rw-r--r--source3/libads/kerberos_verify.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c
index fe22898a26..b903b2a6eb 100644
--- a/source3/libads/kerberos_verify.c
+++ b/source3/libads/kerberos_verify.c
@@ -88,13 +88,7 @@ static bool ads_dedicated_keytab_verify_ticket(krb5_context context,
goto out;
}
-#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK /* Heimdal */
- ret = krb5_copy_keyblock(context, &kt_entry.keyblock, keyblock);
-#elif defined(HAVE_KRB5_KEYTAB_ENTRY_KEY) /* MIT */
- ret = krb5_copy_keyblock(context, &kt_entry.key, keyblock);
-#else
-#error UNKNOWN_KRB5_KEYTAB_ENTRY_FORMAT
-#endif
+ ret = krb5_copy_keyblock(context, KRB5_KT_KEY(&kt_entry), keyblock);
smb_krb5_kt_free_entry(context, &kt_entry);
if (ret) {