From: Luke Howard <lukeh@padl.com>
Date: Sat, 1 Jan 2011 12:18:18 +0000 (+1100)
Subject: More Heimdal portability cleanups
X-Git-Tag: vm/20110310~73
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=commitdiff_plain;h=19a12a2c18c518171ae5088d2bf11e8acc03d33d

More Heimdal portability cleanups
---

diff --git a/util_reauth.c b/util_reauth.c
index 9a4ed8f..28dd133 100644
--- a/util_reauth.c
+++ b/util_reauth.c
@@ -125,9 +125,9 @@ freezeAttrContext(OM_uint32 *minor,
                   krb5_const_principal acceptorPrinc,
                   krb5_keyblock *session,
 #ifdef HAVE_HEIMDAL_VERSION
-                  krb5_authdata *authdata
+                  krb5_authdata *kdcIssuedAuthData
 #else
-                  krb5_authdata ***authdata
+                  krb5_authdata ***kdcIssuedAuthData
 #endif
                   )
 {
@@ -142,6 +142,8 @@ freezeAttrContext(OM_uint32 *minor,
     krb5_authdata *authData[2], authDatum = { 0 };
 #endif
 
+    memset(kdcIssuedAuthData, 0, sizeof(*kdcIssuedAuthData));
+
     GSSEAP_KRB_INIT(&krbContext);
 
     major = gssEapExportAttrContext(minor, initiatorName, &attrBuf);
@@ -162,7 +164,7 @@ freezeAttrContext(OM_uint32 *minor,
 #endif
 
     code = krbMakeAuthDataKdcIssued(krbContext, session, acceptorPrinc,
-                                    authData, authdata);
+                                    authData, kdcIssuedAuthData);
     if (code != 0) {
         major = GSS_S_FAILURE;
         *minor = code;