Change krbCred member to reauthCred to better clarify purpose

[moonshot.git] / mech_eap / store_cred.c

diff --git a/mech_eap/store_cred.c b/mech_eap/store_cred.c
index aec3277..2847f42 100644 (file)
--- a/mech_eap/store_cred.c
+++ b/mech_eap/store_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
@@ -34,33 +34,50 @@
 
 OM_uint32
 gss_store_cred(OM_uint32 *minor,
-               const gss_cred_id_t input_cred_handle,
+               const gss_cred_id_t cred,
                gss_cred_usage_t input_usage,
-               const gss_OID desired_mech,
+               const gss_OID desired_mech GSSEAP_UNUSED,
+#ifdef GSSEAP_ENABLE_REAUTH
                OM_uint32 overwrite_cred,
                OM_uint32 default_cred,
+#else
+               OM_uint32 overwrite_cred GSSEAP_UNUSED,
+               OM_uint32 default_cred GSSEAP_UNUSED,
+#endif
                gss_OID_set *elements_stored,
                gss_cred_usage_t *cred_usage_stored)
 {
+    OM_uint32 major;
+
     if (elements_stored != NULL)
         *elements_stored = GSS_C_NO_OID_SET;
     if (cred_usage_stored != NULL)
         *cred_usage_stored = input_usage;
 
-    if (input_cred_handle == GSS_C_NO_CREDENTIAL)
+    if (cred == GSS_C_NO_CREDENTIAL) {
+        *minor = EINVAL;
         return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_NO_CRED;
-
-    if (input_cred_handle->krbCred != GSS_C_NO_CREDENTIAL) {
-        return gssStoreCred(minor,
-                            input_cred_handle->krbCred,
-                            input_usage,
-                            gss_mech_krb5,
-                            overwrite_cred,
-                            default_cred,
-                            elements_stored,
-                            cred_usage_stored);
     }
 
+    GSSEAP_MUTEX_LOCK(&cred->mutex);
+
+    major = GSS_S_COMPLETE;
     *minor = 0;
-    return GSS_S_UNAVAILABLE;
+
+#ifdef GSSEAP_ENABLE_REAUTH
+    if (cred->reauthCred != GSS_C_NO_CREDENTIAL) {
+        major = gssStoreCred(minor,
+                             cred->reauthCred,
+                             input_usage,
+                             (gss_OID)gss_mech_krb5,
+                             overwrite_cred,
+                             default_cred,
+                             elements_stored,
+                             cred_usage_stored);
+    }
+#endif
+
+    GSSEAP_MUTEX_UNLOCK(&cred->mutex);
+
+    return major;
 }