Better error reporting through com_err

[mech_eap.git] / set_cred_option.c

diff --git a/set_cred_option.c b/set_cred_option.c
index 44ebebc..f73564e 100644 (file)
--- a/set_cred_option.c
+++ b/set_cred_option.c
@@ -33,10 +33,10 @@
 #include "gssapiP_eap.h"
 
 static OM_uint32
-setCredRadiusConfig(OM_uint32 *minor,
-                    gss_cred_id_t cred,
-                    const gss_OID oid,
-                    const gss_buffer_t buffer)
+setCredRadiusConfigFile(OM_uint32 *minor,
+                        gss_cred_id_t cred,
+                        const gss_OID oid,
+                        const gss_buffer_t buffer)
 {
     OM_uint32 major;
     gss_buffer_desc configFileBuffer = GSS_C_EMPTY_BUFFER;
@@ -57,6 +57,30 @@ setCredRadiusConfig(OM_uint32 *minor,
 }
 
 static OM_uint32
+setCredRadiusConfigStanza(OM_uint32 *minor,
+                          gss_cred_id_t cred,
+                          const gss_OID oid,
+                          const gss_buffer_t buffer)
+{
+    OM_uint32 major;
+    gss_buffer_desc configStanzaBuffer = GSS_C_EMPTY_BUFFER;
+
+    if (buffer != GSS_C_NO_BUFFER && buffer->length != 0) {
+        major = duplicateBuffer(minor, buffer, &configStanzaBuffer);
+        if (GSS_ERROR(major))
+            return major;
+    }
+
+    if (cred->radiusConfigStanza != NULL)
+        GSSEAP_FREE(cred->radiusConfigStanza);
+
+    cred->radiusConfigStanza = (char *)configStanzaBuffer.value;
+
+    *minor = 0;
+    return GSS_S_COMPLETE;
+}
+
+static OM_uint32
 setCredFlag(OM_uint32 *minor,
             gss_cred_id_t cred,
             const gss_OID oid,
@@ -88,41 +112,52 @@ static struct {
     OM_uint32 (*setOption)(OM_uint32 *, gss_cred_id_t cred,
                            const gss_OID, const gss_buffer_t);
 } setCredOps[] = {
-    /* 1.3.6.1.4.1.5322.21.3.3.1 */
+    /* 1.3.6.1.4.1.5322.22.3.3.1 */
     {
-        { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x03\x03\x01" },
-        setCredRadiusConfig,
+        { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x03\x03\x01" },
+        setCredRadiusConfigFile,
     },
-    /* 1.3.6.1.4.1.5322.21.3.3.2 */
+    /* 1.3.6.1.4.1.5322.22.3.3.2 */
     {
-        { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x03\x03\x02" },
+        { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x03\x03\x02" },
+        setCredRadiusConfigStanza,
+    },
+    /* 1.3.6.1.4.1.5322.22.3.3.3 */
+    {
+        { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x03\x03\x03" },
         setCredFlag,
     },
 };
 
-gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG = &setCredOps[0].oid;
-gss_OID GSS_EAP_CRED_SET_CRED_FLAG     = &setCredOps[1].oid;
+gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG_FILE     = &setCredOps[0].oid;
+gss_OID GSS_EAP_CRED_SET_RADIUS_CONFIG_STANZA   = &setCredOps[1].oid;
+gss_OID GSS_EAP_CRED_SET_CRED_FLAG              = &setCredOps[2].oid;
 
 OM_uint32
 gssspi_set_cred_option(OM_uint32 *minor,
-                       gss_cred_id_t *cred,
+                       gss_cred_id_t *pCred,
                        const gss_OID desired_object,
                        const gss_buffer_t value)
 {
     OM_uint32 major = GSS_S_UNAVAILABLE;
+    gss_cred_id_t cred = *pCred;
     int i;
 
-    if (*cred == GSS_C_NO_CREDENTIAL)
+    if (cred == GSS_C_NO_CREDENTIAL)
         return GSS_S_UNAVAILABLE;
 
+    GSSEAP_MUTEX_LOCK(&cred->mutex);
+
     for (i = 0; i < sizeof(setCredOps) / sizeof(setCredOps[0]); i++) {
         if (oidEqual(&setCredOps[i].oid, desired_object)) {
-            major = (*setCredOps[i].setOption)(minor, *cred,
-                                              desired_object, value);
+            major = (*setCredOps[i].setOption)(minor, cred,
+                                               desired_object, value);
             break;
         }
     }
 
+    GSSEAP_MUTEX_UNLOCK(&cred->mutex);
+
     return major;
 }