From fcfb235c813d3cfcf23ab905fe2fb159647bc911 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 16 Mar 2005 15:51:58 +0000
Subject: smtp fix

---
(limited to 'kmicromail/libmailwrapper/smtpwrapper.cpp')

diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index 845c71c..448a2e9 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -206,6 +206,7 @@ void SMTPwrapper::connect_server()
         try_tls = false;
     } else if (m_SmtpAccount->ConnectionType() == 2) {
         force_tls = true;
+        try_tls = true;
     } else if (m_SmtpAccount->ConnectionType() == 1) {
         try_tls = true;
     }
@@ -245,15 +246,17 @@ void SMTPwrapper::connect_server()
         }
     }
     if (result && try_tls) {
-        qDebug("Smpt: Try tls ");
+        qDebug("Smpt: Try TLS... ");
         err = start_smtp_tls();
         if (err != MAILSMTP_NO_ERROR) {
             try_tls = false;
-            qDebug("no tls ");
+            qDebug("Smpt: No TLS possible ");
         } else {
             err = mailesmtp_ehlo(m_smtp);
             if ( err  != MAILSMTP_NO_ERROR )
                 result = 0;
+            else
+                qDebug("Smpt: Using TLS ");
         }
     }
     //qDebug("mailesmtp_ehlo %d ",err );
--
cgit v0.9.0.2