[evolution-data-server/gnome-2-30] Bug 599879 - Fix NULL return without exception on krb5-auth-dialog failure (cherry picked from commi

[David Woodhouse <dwmw2 src gnome org>]

commit 013d2bb3ff38b0d2201c6f7d32b6c4f2ce2908e9
Author: David Woodhouse <David Woodhouse intel com>
Date:   Mon Jun 14 11:57:22 2010 +0100

    Bug 599879 - Fix NULL return without exception on krb5-auth-dialog failure
    (cherry picked from commit 14b5de1aa1538daaa9e9942e2b42b23f90c54216)

 camel/camel-sasl-gssapi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-sasl-gssapi.c b/camel/camel-sasl-gssapi.c
index 87ffe91..6febab5 100644
--- a/camel/camel-sasl-gssapi.c
+++ b/camel/camel-sasl-gssapi.c
@@ -344,11 +344,11 @@ gssapi_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
 		default:
 			if (major == (OM_uint32)GSS_S_FAILURE &&
 			    (minor == (OM_uint32)KRB5KRB_AP_ERR_TKT_EXPIRED ||
-			     minor == (OM_uint32)KRB5KDC_ERR_NEVER_VALID)) {
-				if (send_dbus_message (sasl->service->url->user))
+			     minor == (OM_uint32)KRB5KDC_ERR_NEVER_VALID) &&
+			    send_dbus_message (sasl->service->url->user))
 					goto challenge;
-			} else
-				gssapi_set_exception (major, minor, ex);
+
+			gssapi_set_exception (major, minor, ex);
 			return NULL;
 		}