return GSS_S_CREDENTIALS_EXPIRED if credentials expired

[moonshot.git] / mech_eap / inquire_cred.c

diff --git a/mech_eap/inquire_cred.c b/mech_eap/inquire_cred.c
index 243276d..2e684b7 100644 (file)
--- a/mech_eap/inquire_cred.c
+++ b/mech_eap/inquire_cred.c
@@ -45,6 +45,7 @@ gss_inquire_cred(OM_uint32 *minor,
                  gss_OID_set *mechanisms)
 {
     OM_uint32 major;
+    time_t now, lifetime;
 
     if (cred == NULL) {
         *minor = EINVAL;
@@ -59,21 +60,6 @@ gss_inquire_cred(OM_uint32 *minor,
             goto cleanup;
     }
 
-    if (pLifetime != NULL) {
-        time_t now, lifetime;
-
-        if (cred->expiryTime == 0) {
-            lifetime = GSS_C_INDEFINITE;
-        } else  {
-            now = time(NULL);
-            lifetime = now - cred->expiryTime;
-            if (lifetime < 0)
-                lifetime = 0;
-        }
-
-        *pLifetime = lifetime;
-    }
-
     if (cred_usage != NULL) {
         OM_uint32 flags = (cred->flags & (CRED_FLAG_INITIATE | CRED_FLAG_ACCEPT));
 
@@ -99,6 +85,25 @@ gss_inquire_cred(OM_uint32 *minor,
             goto cleanup;
     }
 
+    if (cred->expiryTime == 0) {
+        lifetime = GSS_C_INDEFINITE;
+    } else  {
+        now = time(NULL);
+        lifetime = now - cred->expiryTime;
+        if (lifetime < 0)
+            lifetime = 0;
+    }
+
+    if (pLifetime != NULL) {
+        *pLifetime = lifetime;
+    }
+
+    if (lifetime == 0) {
+        major = GSS_S_CREDENTIALS_EXPIRED;
+        *minor = GSSEAP_CRED_EXPIRED;
+        goto cleanup;
+    }
+
     major = GSS_S_COMPLETE;
     *minor = 0;