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
@@ -233,76 +233,77 @@ void SMTPwrapper::connect_server()
     if ( err != MAILSMTP_NO_ERROR ) {
         qDebug("Error init SMTP connection" );
         failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err));
         result = 0;
     }
 
     qDebug("SMTP connection inited ");
     /* switch to tls after init 'cause there it will send the ehlo */
     if (result) {
         err = mailsmtp_init( m_smtp );
         if (err != MAILSMTP_NO_ERROR) {
             result = 0;
             qDebug("Error init SMTP connection ");
             failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err));
         }
     }
     if (result && try_tls) {
         qDebug("Smpt: Try TLS... ");
         err = start_smtp_tls();
         if (err != MAILSMTP_NO_ERROR) {
             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();
             } else {
                 result = 0;
                 failuretext=i18n("Login aborted - \nstoring mail to localfolder");
             }
         } else {
             user = m_SmtpAccount->getUser();
             pass = m_SmtpAccount->getPassword();
         }
         ; // odebug << "session->auth: " << m_smtp->auth << "" << oendl; 
         if (result) {
             err = mailsmtp_auth( m_smtp, (char*)user.latin1(), (char*)pass.latin1() );
             if ( err == MAILSMTP_NO_ERROR ) {
                 qDebug("Smtp authentification ok ");
             } else {
                 failuretext = i18n("Authentification failed");
                 result = 0;
             }
         }
     }
     if ( result == 0 ) {