summaryrefslogtreecommitdiffabout
path: root/kmicromail
authorzautrix <zautrix>2005-10-22 14:36:31 (UTC)
committer zautrix <zautrix>2005-10-22 14:36:31 (UTC)
commit2e5c0a288f7c54cce7e0327ddbbd160f242758f1 (patch) (side-by-side diff)
tree91a3d3092d71645b1f9f6a6147825d3b27ae006b /kmicromail
parenta72d70beb381b9cd6f2af301b52ca82cdcafb299 (diff)
downloadkdepimpi-2e5c0a288f7c54cce7e0327ddbbd160f242758f1.zip
kdepimpi-2e5c0a288f7c54cce7e0327ddbbd160f242758f1.tar.gz
kdepimpi-2e5c0a288f7c54cce7e0327ddbbd160f242758f1.tar.bz2
fixes
Diffstat (limited to 'kmicromail') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/libmailwrapper/smtpwrapper.cpp13
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()
try_tls = false;
qDebug("Smpt: No TLS possible ");
} else {
qDebug("Smpt: Using TLS ");
}
}
//qDebug("mailesmtp_ehlo %d ",err );
if (!try_tls && force_tls) {
result = 0;
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 {
+ //LR 05-10-22 : qDebug("no elo any more ");
+ // if ( false /*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() ) {
; // odebug << "smtp with auth" << oendl;
if ( m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty() ) {
// get'em
LoginDialog login( m_SmtpAccount->getUser(),
m_SmtpAccount->getPassword(), NULL, 0, true );
login.show();
if ( QDialog::Accepted == login.exec() ) {
// ok
user = login.getUser();
pass = login.getPassword();