author | zautrix <zautrix> | 2005-10-22 14:36:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-22 14:36:31 (UTC) |
commit | 2e5c0a288f7c54cce7e0327ddbbd160f242758f1 (patch) (unidiff) | |
tree | 91a3d3092d71645b1f9f6a6147825d3b27ae006b /kmicromail/libmailwrapper/smtpwrapper.cpp | |
parent | a72d70beb381b9cd6f2af301b52ca82cdcafb299 (diff) | |
download | kdepimpi-2e5c0a288f7c54cce7e0327ddbbd160f242758f1.zip kdepimpi-2e5c0a288f7c54cce7e0327ddbbd160f242758f1.tar.gz kdepimpi-2e5c0a288f7c54cce7e0327ddbbd160f242758f1.tar.bz2 |
fixes
Diffstat (limited to 'kmicromail/libmailwrapper/smtpwrapper.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -261,20 +261,21 @@ void SMTPwrapper::connect_server() | |||
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() ) { |