1 files changed, 14 insertions, 4 deletions

diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index 448a2e9..a6c12e4 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -221,2 +221,3 @@ void SMTPwrapper::connect_server()
     }
+    //m_smtp->auth = MAILSMTP_AUTH_LOGIN;
 
@@ -254,6 +255,2 @@ void SMTPwrapper::connect_server()
         } else {
-            err = mailesmtp_ehlo(m_smtp);
-            if ( err  != MAILSMTP_NO_ERROR )
-                result = 0;
-            else
                 qDebug("Smpt: Using TLS ");
@@ -261,2 +258,3 @@ void SMTPwrapper::connect_server()
     }
+
     //qDebug("mailesmtp_ehlo %d ",err );
@@ -266,2 +264,14 @@ void SMTPwrapper::connect_server()
     }
+    if ( mailesmtp_ehlo(m_smtp) != MAILSMTP_NO_ERROR ) {
+        qDebug("Smpt: ehlo failed ");
+        result = 0;
+    }
+    else {  
+        //qDebug("Smpt: auth is %d -- %d %d",m_smtp->auth, MAILSMTP_AUTH_LOGIN, MAILSMTP_AUTH_PLAIN);
+        if ( m_smtp->auth & MAILSMTP_AUTH_LOGIN &&  m_smtp->auth & MAILSMTP_AUTH_PLAIN ) {
+            qDebug("Smpt: Using MAILSMTP_AUTH_LOGIN ");
+            m_smtp->auth -= MAILSMTP_AUTH_PLAIN;
+            //qDebug("Smpt: auth is %d -- %d %d",m_smtp->auth, MAILSMTP_AUTH_LOGIN, MAILSMTP_AUTH_PLAIN);
+        }
+    }