From ab5a0b75db1dd72a14860f8d9473679ffbabff9d Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Sun, 19 Jan 2014 22:50:37 +0100
Subject: [PATCH] SASL is the only authentication method supported in SMTP (no
 fallback).

---
 src/vmime/net/smtp/SMTPConnection.cpp | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/vmime/net/smtp/SMTPConnection.cpp b/src/vmime/net/smtp/SMTPConnection.cpp
index d7c04345..bb5e3c2e 100644
--- a/src/vmime/net/smtp/SMTPConnection.cpp
+++ b/src/vmime/net/smtp/SMTPConnection.cpp
@@ -284,7 +284,7 @@ void SMTPConnection::authenticate()
 	getAuthenticator()->setService(m_transport.lock());
 
 #if VMIME_HAVE_SASL_SUPPORT
-	// First, try SASL authentication
+	// Try SASL authentication
 	if (GET_PROPERTY(bool, PROPERTY_OPTIONS_SASL))
 	{
 		try
@@ -294,19 +294,6 @@ void SMTPConnection::authenticate()
 			m_authenticated = true;
 			return;
 		}
-		catch (exceptions::authentication_error& e)
-		{
-			if (!GET_PROPERTY(bool, PROPERTY_OPTIONS_SASL_FALLBACK))
-			{
-				// Can't fallback on normal authentication
-				internalDisconnect();
-				throw e;
-			}
-			else
-			{
-				// Ignore, will try normal authentication
-			}
-		}
 		catch (exception& e)
 		{
 			internalDisconnect();