Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot

[mech_eap.git] / release_any_name_mapping.c

diff --git a/release_any_name_mapping.c b/release_any_name_mapping.c
index a52642c..8ac29a0 100644 (file)
--- a/release_any_name_mapping.c
+++ b/release_any_name_mapping.c
@@ -40,6 +40,8 @@ gss_release_any_name_mapping(OM_uint32 *minor,
 {
     OM_uint32 major;
 
+    *minor = 0;
+
     if (name == GSS_C_NO_NAME) {
         *minor = EINVAL;
         return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_BAD_NAME;
@@ -47,10 +49,9 @@ gss_release_any_name_mapping(OM_uint32 *minor,
 
     GSSEAP_MUTEX_LOCK(&name->mutex);
 
-    if (name->flags & NAME_FLAG_SAML_ATTRIBUTES)
-        major = samlReleaseAnyNameMapping(minor, name, type_id, input);
-    else
-        major = GSS_S_UNAVAILABLE;
+    major = gssEapReleaseAnyNameMapping(minor, name, type_id, input);
+
+    *input = NULL;
 
     GSSEAP_MUTEX_UNLOCK(&name->mutex);