git.samba.org
/
nivanova
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3367812
)
s3-kerberos: use KRB5_KT_KEY compat macro.
author
Günther Deschner
<gd@samba.org>
Tue, 3 Feb 2009 13:15:40 +0000
(14:15 +0100)
committer
Günther Deschner
<gd@samba.org>
Tue, 3 Feb 2009 14:32:47 +0000
(15:32 +0100)
Guenther
source3/libads/kerberos_verify.c
patch
|
blob
|
history
diff --git
a/source3/libads/kerberos_verify.c
b/source3/libads/kerberos_verify.c
index fe22898a26e2a49ad904ddc8107ab3d6ebdaa0e5..b903b2a6eb8daf83acf1a72fd18b27199c8d18fe 100644
(file)
--- 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) {