From f5b79b44f25cdf4ba4363c7c05892af2865ce890 Mon Sep 17 00:00:00 2001 From: Torsten Kurbad Date: Thu, 1 Apr 2010 21:47:18 -0400 Subject: cifs-upcall: heimdal fixes Signed-off-by: Torsten Kurbad --- replace.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'replace.h') diff --git a/replace.h b/replace.h index 69cf776..ee4d618 100644 --- a/replace.h +++ b/replace.h @@ -666,4 +666,17 @@ typedef uint32_t NTSTATUS; #define NT_STATUS(x) (x) #define NT_STATUS_V(x) (x) +/* These macros unify the keyblock handling of Heimdal and MIT somewhat */ +#ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE /* Heimdal */ +#define KRB5_KEY_TYPE(k) ((k)->keytype) +#define KRB5_KEY_LENGTH(k) ((k)->keyvalue.length) +#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_LENGTH(k) ((k)->length) +#define KRB5_KEY_DATA(k) ((k)->contents) +#define KRB5_KEY_DATA_CAST krb5_octet +#endif + #endif /* _LIBREPLACE_REPLACE_H */ -- cgit v1.2.3