[evolution/email-factory-3-4: 11/38] Ported d623d8213349b1cba8c2bbd43fb7034c2f09e002

[Srinivasa Ragavan <sragavan src gnome org>]

commit 735a54f611ae03695e440cbba278924f0bf7a50a
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Mon Oct 31 12:39:50 2011 +0530

    Ported d623d8213349b1cba8c2bbd43fb7034c2f09e002

 libemail-engine/e-mail-session.c |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index 7e65f4e..f4eab7e 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -990,19 +990,10 @@ mail_session_authenticate_sync (CamelSession *session,
 	url = camel_service_get_camel_url (service);
 	provider = camel_service_get_provider (service);
 
-	/* If a SASL mechanism was given and we can't find
-	 * a CamelServiceAuthType for it, fail immediately. */
-	if (mechanism != NULL) {
+	/* APOP is one case where a non-SASL mechanism name is passed, so
+	 * don't bail if the CamelServiceAuthType struct comes back NULL. */
+	if (mechanism != NULL)
 		authtype = camel_sasl_authtype (mechanism);
-		if (authtype == NULL) {
-			g_set_error (
-				error, CAMEL_SERVICE_ERROR,
-				CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE,
-				_("No support for %s authentication"),
-				mechanism);
-			return FALSE;
-		}
-	}
 
 	/* If the SASL mechanism does not involve a user
 	 * password, then it gets one shot to authenticate. */