| -rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 22 |
1 files changed, 16 insertions, 6 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,9 +255,6 @@ void SMTPwrapper::connect_server() } else { - err = mailesmtp_ehlo(m_smtp); - if ( err != MAILSMTP_NO_ERROR ) - result = 0; - else - qDebug("Smpt: Using TLS "); + qDebug("Smpt: Using TLS "); } } + //qDebug("mailesmtp_ehlo %d ",err ); @@ -265,4 +263,16 @@ void SMTPwrapper::connect_server() failuretext = i18n("Error init SMTP tls:%1").arg(mailsmtpError(err)); + } + 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); + } + } + if (result==1 && m_SmtpAccount->getLogin() ) { |