From d623d8213349b1cba8c2bbd43fb7034c2f09e002 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 15 Oct 2011 11:46:28 -0400
Subject: Realized I broke APOP authentication.
---
mail/e-mail-session.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index c7784447bd..c14bdd56d8 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -1117,19 +1117,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. */
--
cgit v1.2.3