asetkey-with-heimdal-20070104

[openafs.git] / src / aklog / asetkey.c

diff --git a/src/aklog/asetkey.c b/src/aklog/asetkey.c
index 3664222..5e1ca75 100644 (file)
--- a/src/aklog/asetkey.c
+++ b/src/aklog/asetkey.c
@@ -6,10 +6,17 @@
  * Updated for Kerberos 5
  */
 
+#include <afsconfig.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
 #endif /* HAVE_MEMORY_H */
@@ -21,14 +28,21 @@
 #endif /* HAVE_STRINGS_H */
 #endif /* HAVE_STRING_H */
 
+#include <afs/stds.h>
 #include <krb5.h>
-#include <com_err.h>
 
-#include <afs/stds.h>
+#include <afs/com_err.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
 #include <afs/dirpath.h>
 
+#ifdef HAVE_KRB5_CREDS_KEYBLOCK
+#define USING_MIT 1
+#endif
+#ifdef HAVE_KRB5_CREDS_SESSION
+#define USING_HEIMDAL 1
+#endif
+
 int
 main(int argc, char *argv[])
 {
@@ -81,13 +95,26 @@ main(int argc, char *argv[])
                exit(1);
        }
 
-       if (key->length != 8) {
+#ifdef USING_HEIMDAL
+#define deref_key_length(key) \
+         key->keyvalue.length
+
+#define deref_key_contents(key) \
+       key->keyvalue.data
+#else
+#define deref_key_length(key) \
+         key->length
+
+#define deref_key_contents(key) \
+       key->contents
+#endif
+       if (deref_key_length(key) != 8) {
                fprintf(stderr, "Key length should be 8, but is really %d!\n",
-                      key->length);
+                       deref_key_length(key));
                exit(1);
        }
 
-       code = afsconf_AddKey(tdir, kvno, (char *) key->contents, 1);
+       code = afsconf_AddKey(tdir, kvno, (char *) deref_key_contents(key), 1);
        if (code) {
            fprintf(stderr, "%s: failed to set key, code %d.\n", argv[0], code);
            exit(1);