From 85d70ea953c6fb44f200ed4be13cded7413559b8 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Sun, 23 Jun 2019 16:25:27 -0500 Subject: [PATCH] asetkey: Fix random_key for Heimdal Go through our deref_key_length/deref_key_contents abstractions, so we can compile with Heimdal krb5. Also fix these macros to properly separate the 'key' macro argument, so we can use the macros in these new places. Change-Id: I3ee53bc70494a67ac5463819dc575c8ee37647c9 Reviewed-on: https://gerrit.openafs.org/13652 Tested-by: BuildBot Reviewed-by: Tim Creech Reviewed-by: Benjamin Kaduk --- src/aklog/asetkey.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/aklog/asetkey.c b/src/aklog/asetkey.c index 134b5fe..f24dddf 100644 --- a/src/aklog/asetkey.c +++ b/src/aklog/asetkey.c @@ -95,16 +95,16 @@ keyFromCommandLine(afsconf_keyType type, int kvno, int subType, #ifdef USING_HEIMDAL #define deref_key_length(key) \ - key->keyvalue.length + (key)->keyvalue.length #define deref_key_contents(key) \ - key->keyvalue.data + (key)->keyvalue.data #else #define deref_key_length(key) \ - key->length + (key)->length #define deref_key_contents(key) \ - key->contents + (key)->contents #endif static struct afsconf_typedKey * @@ -260,8 +260,8 @@ random_key(char **argv, int type, int kvno, int subtype) } memset(&key, 0, sizeof(key)); - key.len = keyblock.length; - key.val = keyblock.contents; + key.len = deref_key_length(&keyblock); + key.val = deref_key_contents(&keyblock); typedKey = afsconf_typedKey_new(type, kvno, subtype, &key); -- 1.9.4