summaryrefslogtreecommitdiff
path: root/replace.h
diff options
context:
space:
mode:
authorTorsten Kurbad <torsten@tk-webart.de>2010-04-01 21:47:18 -0400
committerJeff Layton <jlayton@redhat.com>2010-04-01 21:47:18 -0400
commitf5b79b44f25cdf4ba4363c7c05892af2865ce890 (patch)
tree4450143d0b7eb2924fb17464ba7bfb3aa1b7533e /replace.h
parent20a5ec8bd8ea3edb943adb517f378938e31f1c41 (diff)
downloadcifs-utils-f5b79b44f25cdf4ba4363c7c05892af2865ce890.tar.gz
cifs-utils-f5b79b44f25cdf4ba4363c7c05892af2865ce890.tar.bz2
cifs-utils-f5b79b44f25cdf4ba4363c7c05892af2865ce890.zip
cifs-upcall: heimdal fixes
Signed-off-by: Torsten Kurbad <torsten@tk-webart.de>
Diffstat (limited to 'replace.h')
-rw-r--r--replace.h13
1 files changed, 13 insertions, 0 deletions
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 */