X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=mech_eap%2Futil_lucid.c;h=f50e49841a870382857cf9fc144a74f4b4955df8;hp=359058c1963acddec65ab11e7523fcf12a8fd967;hb=HEAD;hpb=5d2cc0917c19bdb6196f060cac3af9f175b295c8

diff --git a/mech_eap/util_lucid.c b/mech_eap/util_lucid.c
index 359058c..f50e498 100644
--- a/mech_eap/util_lucid.c
+++ b/mech_eap/util_lucid.c
@@ -38,7 +38,7 @@
 
 OM_uint32
 gssEapExportLucidSecContext(OM_uint32 *minor,
-                            gss_ctx_id_t ctx,
+                            gss_const_ctx_id_t ctx,
                             const gss_OID desiredObject GSSEAP_UNUSED,
                             gss_buffer_set_t *data_set)
 {
@@ -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));