Merge branch 'windows'

[moonshot.git] / moonshot / mech_eap / util_krb.c

diff --git a/moonshot/mech_eap/util_krb.c b/moonshot/mech_eap/util_krb.c
index 73cf108..d56c7a8 100644 (file)
--- a/moonshot/mech_eap/util_krb.c
+++ b/moonshot/mech_eap/util_krb.c
@@ -80,18 +80,17 @@ cleanup:
 OM_uint32
 gssEapKerberosInit(OM_uint32 *minor, krb5_context *context)
 {
-    struct gss_eap_thread_local_data* tld;
+    struct gss_eap_thread_local_data *tld;
+
     *minor = 0;
 
     tld = gssEapGetThreadLocalData();
-    if (tld)
-    {
-        *context = tld->context;
+    if (tld != NULL) {
+        *context = tld->krbContext;
         if (*context == NULL) {
             *minor = initKrbContext(context);
-            if (*minor == 0) {
-                tld->context = *context;
-            }
+            if (*minor == 0)
+                tld->krbContext = *context;
         }
     }
     return *minor == 0 ? GSS_S_COMPLETE : GSS_S_FAILURE;
@@ -280,7 +279,7 @@ rfc3961ChecksumTypeForKey(OM_uint32 *minor,
 #endif /* HAVE_KRB5INT_C_MANDATORY_CKSUMTYPE */
 
     if (!krb5_c_is_keyed_cksum(*cksumtype)) {
-        *minor = KRB5KRB_AP_ERR_INAPP_CKSUM;
+        *minor = (OM_uint32)KRB5KRB_AP_ERR_INAPP_CKSUM;
         return GSS_S_FAILURE;
     }