From 50f753f9085ed2c300023afed1e9ef818a89270f Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Sun, 2 Jan 2011 20:43:10 +1100
Subject: [PATCH] Cleanup

---
 util_reauth.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/util_reauth.c b/util_reauth.c
index 8b853cb..ebeb4f2 100644
--- a/util_reauth.c
+++ b/util_reauth.c
@@ -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)
-- 
2.1.4