[evolution-data-server/evolution-data-server-3-12] camel-sasl-gssapi: Always use gss_display_status() for mechanism error code

[David Woodhouse <dwmw2 src gnome org>]

commit bdc3614cc5a0d3dac69568616742b6ca20738894
Author: David Woodhouse <David Woodhouse intel com>
Date:   Tue Jul 22 01:05:49 2014 +0100

    camel-sasl-gssapi: Always use gss_display_status() for mechanism error code
    
    (cherry picked from commit 581c32aad09a45723d39124c51943dffac0ea9e4)

 camel/camel-sasl-gssapi.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-sasl-gssapi.c b/camel/camel-sasl-gssapi.c
index 1c236fd..82d1e6e 100644
--- a/camel/camel-sasl-gssapi.c
+++ b/camel/camel-sasl-gssapi.c
@@ -217,10 +217,7 @@ gssapi_set_exception (gss_OID mech, OM_uint32 major, OM_uint32 minor,
                str = _("The referenced credentials have expired.");
                break;
        case GSS_S_FAILURE:
-               if (mech == GSS_C_OID_KRBV5_DES)
-                       str = error_message (minor);
-               else
-                       return gssapi_set_mechanism_exception (mech, minor, error);
+               return gssapi_set_mechanism_exception (mech, minor, error);
                break;
        default:
                str = _("Bad authentication response from server.");