diff options
| author | Günther Deschner <gd@samba.org> | 2008-08-22 14:52:10 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-08-29 11:01:34 +0200 |
| commit | 87ea8f3fae44b5442f1e5303bf1d5326f1bfd5ae (patch) | |
| tree | f66a899580cdfc3cd67c27b96bdb28d33d2575be | |
| parent | 0380fe9d823d6219441050a9b7298bf039b20742 (diff) | |
| download | samba-87ea8f3fae44b5442f1e5303bf1d5326f1bfd5ae.tar.gz samba-87ea8f3fae44b5442f1e5303bf1d5326f1bfd5ae.tar.bz2 samba-87ea8f3fae44b5442f1e5303bf1d5326f1bfd5ae.zip | |
kerberos: add KRB5_KT_KEY abstraction macro.
Guenther
(This used to be commit be846d5383ef31136cca6b11eb6181736fb2e29d)
| -rw-r--r-- | source3/include/ads.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h index a31141cb25..ebe8be08b6 100644 --- a/source3/include/ads.h +++ b/source3/include/ads.h @@ -382,12 +382,20 @@ typedef struct { #define KRB5_KEY_DATA(k) ((k)->keyvalue.data) #define KRB5_KEY_DATA_CAST void #else /* MIT */ -#define KRB5_KEY_TYPE(k) ((k)->enctype) +#define KRB5_KEY_TYPE(k) ((k)->enctype) #define KRB5_KEY_LENGTH(k) ((k)->length) #define KRB5_KEY_DATA(k) ((k)->contents) #define KRB5_KEY_DATA_CAST krb5_octet #endif /* HAVE_KRB5_KEYBLOCK_KEYVALUE */ +#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEY /* MIT */ +#define KRB5_KT_KEY(k) (&(k)->key) +#elif HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK /* Heimdal */ +#define KRB5_KT_KEY(k) (&(k)->keyblock) +#else +#error krb5_keytab_entry has no key or keyblock member +#endif + enum ads_extended_dn_flags { ADS_EXTENDED_DN_HEX_STRING = 0, ADS_EXTENDED_DN_STRING = 1 /* not supported on win2k */ |