don't fail hard if reauth cred generation fails

[mech_eap.orig] / util_attr.cpp

diff --git a/util_attr.cpp b/util_attr.cpp
index e5fb568..9266b6b 100644 (file)
--- a/util_attr.cpp
+++ b/util_attr.cpp
@@ -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
@@ -1040,15 +1040,14 @@ OM_uint32
 gssEapCreateAttrContext(OM_uint32 *minor,
                         gss_cred_id_t gssCred,
                         gss_ctx_id_t gssCtx,
-                        struct gss_eap_attr_ctx **pAttrContext)
+                        struct gss_eap_attr_ctx **pAttrContext,
+                        time_t *pExpiryTime)
 {
     gss_eap_attr_ctx *ctx;
     OM_uint32 major;
 
     assert(gssCtx != GSS_C_NO_CONTEXT);
 
-    *pAttrContext = NULL;
-
     major = gssEapAttrProvidersInit(minor);
     if (GSS_ERROR(major))
         return major;
@@ -1066,9 +1065,8 @@ gssEapCreateAttrContext(OM_uint32 *minor,
         return major;
     }
 
-    gssCtx->expiryTime = ctx->getExpiryTime();
-
     *pAttrContext = ctx;
+    *pExpiryTime = ctx->getExpiryTime();
 
     *minor = 0;
     return GSS_S_COMPLETE;