comment out dumping code

[mech_eap.orig] / set_cred_option.c

diff --git a/set_cred_option.c b/set_cred_option.c
index 95ec6a4..bfffa1f 100644 (file)
--- a/set_cred_option.c
+++ b/set_cred_option.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,12 +30,16 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Set an extended property on a credential handle.
+ */
+
 #include "gssapiP_eap.h"
 
 static OM_uint32
 setCredRadiusConfigFile(OM_uint32 *minor,
                         gss_cred_id_t cred,
-                        const gss_OID oid,
+                        const gss_OID oid GSSEAP_UNUSED,
                         const gss_buffer_t buffer)
 {
     OM_uint32 major;
@@ -59,7 +63,7 @@ setCredRadiusConfigFile(OM_uint32 *minor,
 static OM_uint32
 setCredRadiusConfigStanza(OM_uint32 *minor,
                           gss_cred_id_t cred,
-                          const gss_OID oid,
+                          const gss_OID oid GSSEAP_UNUSED,
                           const gss_buffer_t buffer)
 {
     OM_uint32 major;
@@ -83,7 +87,7 @@ setCredRadiusConfigStanza(OM_uint32 *minor,
 static OM_uint32
 setCredFlag(OM_uint32 *minor,
             gss_cred_id_t cred,
-            const gss_OID oid,
+            const gss_OID oid GSSEAP_UNUSED,
             const gss_buffer_t buffer)
 {
     OM_uint32 flags;
@@ -91,7 +95,7 @@ setCredFlag(OM_uint32 *minor,
 
     if (buffer == GSS_C_NO_BUFFER) {
         *minor = EINVAL;
-        return GSS_S_FAILURE;
+        return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_FAILURE;
     }
 
     if (buffer->length < 4) {
@@ -144,15 +148,20 @@ gssspi_set_cred_option(OM_uint32 *minor,
                        const gss_OID desired_object,
                        const gss_buffer_t value)
 {
-    OM_uint32 major = GSS_S_UNAVAILABLE;
+    OM_uint32 major;
     gss_cred_id_t cred = *pCred;
     int i;
 
-    if (cred == GSS_C_NO_CREDENTIAL)
+    if (cred == GSS_C_NO_CREDENTIAL) {
+        *minor = EINVAL;
         return GSS_S_UNAVAILABLE;
+    }
 
     GSSEAP_MUTEX_LOCK(&cred->mutex);
 
+    major = GSS_S_UNAVAILABLE;
+    *minor = GSSEAP_BAD_CRED_OPTION;
+
     for (i = 0; i < sizeof(setCredOps) / sizeof(setCredOps[0]); i++) {
         if (oidEqual(&setCredOps[i].oid, desired_object)) {
             major = (*setCredOps[i].setOption)(minor, cred,
@@ -182,7 +191,7 @@ gsseap_set_cred_flag(OM_uint32 *minor,
     store_uint32_be(flag, buf);
     buf[4] = (clear != 0);
 
-    return gssspi_set_cred_option(minor, cred,
+    return gssspi_set_cred_option(minor, &cred,
                                   GSS_EAP_CRED_SET_CRED_FLAG, &value);
 }
 #endif