From: Luke Howard <lukeh@padl.com>
Date: Thu, 17 Nov 2011 11:15:47 +0000 (+1100)
Subject: NFSv4 patch from Daniel Kouril
X-Git-Tag: tr-beta1~56
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=76a9dc1b58c74932e284ec24f37a21d0659598ab

NFSv4 patch from Daniel Kouril
---

diff --git a/moonshot/mech_eap/util_lucid.c b/moonshot/mech_eap/util_lucid.c
index 359058c..f9e9941 100644
--- a/moonshot/mech_eap/util_lucid.c
+++ b/moonshot/mech_eap/util_lucid.c
@@ -136,7 +136,10 @@ cleanup:
 
     lctx->version = 1;
     lctx->initiate = CTX_IS_INITIATOR(ctx);
-    lctx->endtime = ctx->expiryTime;
+    if (ctx->expiryTime == 0)
+        lctx->endtime = KRB_TIME_FOREVER;
+    else
+        lctx->endtime = ctx->expiryTime;
     lctx->send_seq = ctx->sendSeq;
     lctx->recv_seq = ctx->recvSeq;
     lctx->protocol = 1;
@@ -144,8 +147,8 @@ cleanup:
     lctx->cfx_kd.have_acceptor_subkey = haveAcceptorSubkey;
 
     lkey = haveAcceptorSubkey
-           ? &lctx->cfx_kd.ctx_key
-           : &lctx->cfx_kd.acceptor_subkey;
+           ? &lctx->cfx_kd.acceptor_subkey
+           : &lctx->cfx_kd.ctx_key;
 
     lkey->type = KRB_KEY_TYPE(&ctx->rfc3961Key);
     lkey->data = GSSEAP_MALLOC(KRB_KEY_LENGTH(&ctx->rfc3961Key));