aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Richard <[email protected]>2014-01-19 21:50:37 +0000
committerVincent Richard <[email protected]>2014-01-19 21:50:37 +0000
commitab5a0b75db1dd72a14860f8d9473679ffbabff9d (patch)
treeb0f9fe512347c13fcb3d9a73e36589c4401c1647
parentCalling getAttributes() does not require the folder to be open. (diff)
downloadvmime-ab5a0b75db1dd72a14860f8d9473679ffbabff9d.tar.gz
vmime-ab5a0b75db1dd72a14860f8d9473679ffbabff9d.zip
SASL is the only authentication method supported in SMTP (no fallback).
-rw-r--r--src/vmime/net/smtp/SMTPConnection.cpp15
1 files changed, 1 insertions, 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();