Cleanup

[mech_eap.orig] / inquire_cred_by_oid.c

diff --git a/inquire_cred_by_oid.c b/inquire_cred_by_oid.c
index 569b7b5..33bfce3 100644 (file)
--- a/inquire_cred_by_oid.c
+++ b/inquire_cred_by_oid.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Return extended credential handle properties.
+ */
+
 #include "gssapiP_eap.h"
 
 static struct {
@@ -45,17 +49,21 @@ gss_inquire_cred_by_oid(OM_uint32 *minor,
                         const gss_OID desired_object,
                         gss_buffer_set_t *data_set)
 {
-    OM_uint32 major = GSS_S_UNAVAILABLE;
+    OM_uint32 major;
     int i;
 
-    *minor = 0;
     *data_set = GSS_C_NO_BUFFER_SET;
 
-    if (cred_handle == GSS_C_NO_CREDENTIAL)
-        return GSS_S_NO_CRED;
+    if (cred_handle == GSS_C_NO_CREDENTIAL) {
+        *minor = EINVAL;
+        return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_NO_CRED;
+    }
 
     GSSEAP_MUTEX_LOCK(&cred_handle->mutex);
 
+    major = GSS_S_UNAVAILABLE;
+    *minor = GSSEAP_BAD_CRED_OPTION;
+
     for (i = 0; i < sizeof(inquireCredOps) / sizeof(inquireCredOps[0]); i++) {
         if (oidEqual(&inquireCredOps[i].oid, desired_object)) {
             major = (*inquireCredOps[i].inquire)(minor, cred_handle,