Merge branch 'fastreauth'

Conflicts:
	mech_eap/util_cred.c

diff --combined set_cred_option.c
index 48d2ceb,b42dd80..44ebebc
--- 1/set_cred_option.c
--- 2/set_cred_option.c
+++ b/set_cred_option.c
@@@ -48,7 -48,7 +48,7 @@@ setCredRadiusConfig(OM_uint32 *minor
      }
  
      if (cred->radiusConfigFile != NULL)
 -        free(cred->radiusConfigFile);
 +        GSSEAP_FREE(cred->radiusConfigFile);
  
      cred->radiusConfigFile = (char *)configFileBuffer.value;
  
@@@ -105,16 -105,19 +105,19 @@@ gss_OID GSS_EAP_CRED_SET_CRED_FLAG     
  
  OM_uint32
  gssspi_set_cred_option(OM_uint32 *minor,
-                        gss_cred_id_t cred,
+                        gss_cred_id_t *cred,
                         const gss_OID desired_object,
                         const gss_buffer_t value)
  {
      OM_uint32 major = GSS_S_UNAVAILABLE;
      int i;
  
+     if (*cred == GSS_C_NO_CREDENTIAL)
+         return GSS_S_UNAVAILABLE;
+ 
      for (i = 0; i < sizeof(setCredOps) / sizeof(setCredOps[0]); i++) {
          if (oidEqual(&setCredOps[i].oid, desired_object)) {
-             major = (*setCredOps[i].setOption)(minor, cred,
+             major = (*setCredOps[i].setOption)(minor, *cred,
                                                desired_object, value);
              break;
          }