send a composite name token instead of a sec context to shib

[mech_eap.orig] / inquire_cred.c

diff --git a/inquire_cred.c b/inquire_cred.c
index 05ae554..2e684b7 100644 (file)
--- a/inquire_cred.c
+++ b/inquire_cred.c
@@ -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
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Return credential handle properties.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32
@@ -40,10 +44,13 @@ gss_inquire_cred(OM_uint32 *minor,
                  gss_cred_usage_t *cred_usage,
                  gss_OID_set *mechanisms)
 {
-    OM_uint32 major = GSS_S_COMPLETE;
+    OM_uint32 major;
+    time_t now, lifetime;
 
-    if (cred == NULL)
+    if (cred == NULL) {
+        *minor = EINVAL;
         return GSS_S_NO_CRED;
+    }
 
     GSSEAP_MUTEX_LOCK(&cred->mutex);
 
@@ -53,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));
 
@@ -93,6 +85,28 @@ 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;
+
 cleanup:
     GSSEAP_MUTEX_UNLOCK(&cred->mutex);