-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp index a6c12e4..7c813cc 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.cpp +++ b/kmicromail/libmailwrapper/smtpwrapper.cpp | |||
@@ -253,36 +253,37 @@ void SMTPwrapper::connect_server() | |||
253 | try_tls = false; | 253 | try_tls = false; |
254 | qDebug("Smpt: No TLS possible "); | 254 | qDebug("Smpt: No TLS possible "); |
255 | } else { | 255 | } else { |
256 | qDebug("Smpt: Using TLS "); | 256 | qDebug("Smpt: Using TLS "); |
257 | } | 257 | } |
258 | } | 258 | } |
259 | 259 | ||
260 | //qDebug("mailesmtp_ehlo %d ",err ); | 260 | //qDebug("mailesmtp_ehlo %d ",err ); |
261 | if (!try_tls && force_tls) { | 261 | if (!try_tls && force_tls) { |
262 | result = 0; | 262 | result = 0; |
263 | failuretext = i18n("Error init SMTP tls:%1").arg(mailsmtpError(err)); | 263 | failuretext = i18n("Error init SMTP tls:%1").arg(mailsmtpError(err)); |
264 | } | 264 | } |
265 | if ( mailesmtp_ehlo(m_smtp) != MAILSMTP_NO_ERROR ) { | 265 | //LR 05-10-22 : qDebug("no elo any more "); |
266 | qDebug("Smpt: ehlo failed "); | 266 | // if ( false /*mailesmtp_ehlo(m_smtp) != MAILSMTP_NO_ERROR */) { |
267 | result = 0; | 267 | // qDebug("Smpt: ehlo failed "); |
268 | } | 268 | // result = 0; |
269 | else { | 269 | // } |
270 | // else { | ||
270 | //qDebug("Smpt: auth is %d -- %d %d",m_smtp->auth, MAILSMTP_AUTH_LOGIN, MAILSMTP_AUTH_PLAIN); | 271 | //qDebug("Smpt: auth is %d -- %d %d",m_smtp->auth, MAILSMTP_AUTH_LOGIN, MAILSMTP_AUTH_PLAIN); |
271 | if ( m_smtp->auth & MAILSMTP_AUTH_LOGIN && m_smtp->auth & MAILSMTP_AUTH_PLAIN ) { | 272 | if ( m_smtp->auth & MAILSMTP_AUTH_LOGIN && m_smtp->auth & MAILSMTP_AUTH_PLAIN ) { |
272 | qDebug("Smpt: Using MAILSMTP_AUTH_LOGIN "); | 273 | qDebug("Smpt: Using MAILSMTP_AUTH_LOGIN "); |
273 | m_smtp->auth -= MAILSMTP_AUTH_PLAIN; | 274 | m_smtp->auth -= MAILSMTP_AUTH_PLAIN; |
274 | //qDebug("Smpt: auth is %d -- %d %d",m_smtp->auth, MAILSMTP_AUTH_LOGIN, MAILSMTP_AUTH_PLAIN); | 275 | //qDebug("Smpt: auth is %d -- %d %d",m_smtp->auth, MAILSMTP_AUTH_LOGIN, MAILSMTP_AUTH_PLAIN); |
275 | } | 276 | } |
276 | } | 277 | // } |
277 | 278 | ||
278 | if (result==1 && m_SmtpAccount->getLogin() ) { | 279 | if (result==1 && m_SmtpAccount->getLogin() ) { |
279 | ; // odebug << "smtp with auth" << oendl; | 280 | ; // odebug << "smtp with auth" << oendl; |
280 | if ( m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty() ) { | 281 | if ( m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty() ) { |
281 | // get'em | 282 | // get'em |
282 | LoginDialog login( m_SmtpAccount->getUser(), | 283 | LoginDialog login( m_SmtpAccount->getUser(), |
283 | m_SmtpAccount->getPassword(), NULL, 0, true ); | 284 | m_SmtpAccount->getPassword(), NULL, 0, true ); |
284 | login.show(); | 285 | login.show(); |
285 | if ( QDialog::Accepted == login.exec() ) { | 286 | if ( QDialog::Accepted == login.exec() ) { |
286 | // ok | 287 | // ok |
287 | user = login.getUser(); | 288 | user = login.getUser(); |
288 | pass = login.getPassword(); | 289 | pass = login.getPassword(); |