add some more assertion checks

[mech_eap.orig] / util_reauth.c

diff --git a/util_reauth.c b/util_reauth.c
index 8b853cb..a03f285 100644 (file)
--- a/util_reauth.c
+++ b/util_reauth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -223,18 +223,14 @@ gssEapMakeReauthCreds(OM_uint32 *minor,
     } else if (code != 0)
         goto cleanup;
 
-#ifdef HAVE_HEIMDAL_VERSION
-    ticket.realm = server->realm;
-    ticket.sname = server->name;
-#else
-    ticket.server = server;
-#endif
-
     /*
      * Generate a random session key to place in the ticket and
      * sign the "KDC-Issued" authorization data element.
      */
 #ifdef HAVE_HEIMDAL_VERSION
+    ticket.realm = server->realm;
+    ticket.sname = server->name;
+
     code = krb5_generate_random_keyblock(krbContext, ctx->encryptionType,
                                          &session);
     if (code != 0)
@@ -280,6 +276,8 @@ gssEapMakeReauthCreds(OM_uint32 *minor,
     if (code != 0)
         goto cleanup;
 #else
+    ticket.server = server;
+
     code = krb5_c_make_random_key(krbContext, ctx->encryptionType,
                                   &session);
     if (code != 0)
@@ -787,10 +785,10 @@ cleanup:
  */
 OM_uint32
 gssEapReauthComplete(OM_uint32 *minor,
-                    gss_ctx_id_t ctx,
-                    gss_cred_id_t cred,
-                    const gss_OID mech,
-                    OM_uint32 timeRec)
+                     gss_ctx_id_t ctx,
+                     gss_cred_id_t cred,
+                     const gss_OID mech,
+                     OM_uint32 timeRec)
 {
     OM_uint32 major, tmpMinor;
     gss_buffer_set_t keyData = GSS_C_NO_BUFFER_SET;