MIT build fixes
authorLuke Howard <lukeh@padl.com>
Sat, 1 Jan 2011 11:07:43 +0000 (22:07 +1100)
committerLuke Howard <lukeh@padl.com>
Sat, 1 Jan 2011 11:07:43 +0000 (22:07 +1100)
util_krb.c

index d753fe2..e96f5e6 100644 (file)
@@ -501,10 +501,11 @@ krbMakeCred(krb5_context krbContext,
     unsigned char *buf = NULL;
     size_t buf_size, len;
 #else
-    krb5_data **d;
+    krb5_data *d = NULL;
 #endif
 
     memset(data, 0, sizeof(*data));
+#ifdef HAVE_HEIMDAL_VERSION
     memset(&krbCred, 0, sizeof(krbCred));
     memset(&krbCredInfo, 0, sizeof(krbCredInfo));
 
@@ -512,7 +513,6 @@ krbMakeCred(krb5_context krbContext,
           ? authContext->local_subkey
           : authContext->keyblock;
 
-#ifdef HAVE_HEIMDAL_VERSION
     krbCred.pvno = 5;
     krbCred.msg_type = krb_cred;
     krbCred.tickets.val = (Ticket *)GSSEAP_CALLOC(1, sizeof(Ticket));
@@ -574,9 +574,9 @@ cleanup:
 
     return code;
 #else
-    code = krb5_mk_1cred(krbContext, authContext, creds, &d);
+    code = krb5_mk_1cred(krbContext, authContext, creds, &d, NULL);
     if (code == 0) {
-        *data = **d;
+        *data = *d;
         GSSEAP_FREE(d);
     }