Get mailtransport with kolabnow to work

when connecting to smtps:// the command will silently fail,
with wireshark spewing out a cryptic "5.5.2 command not recognized".

The magic commandline (that works) is:
    curl smtp://smtp.kolabnow.com:587 -v --mail-from
    "$USER" --mail-rcpt "$USER" --ssl -u
    $USER.ch:$PW -T alternative.mbox -k --anyauth

3 files changed, 13 insertions, 9 deletions

diff --git a/examples/mailtransportresource/mailtransport.cpp b/examples/mailtransportresource/mailtransport.cpp
index 3d56af9..8e18203 100644
--- a/examples/mailtransportresource/mailtransport.cpp
+++ b/examples/mailtransportresource/mailtransport.cpp
@@ -88,7 +88,7 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
         curl_easy_setopt(curl, CURLOPT_URL, server);
 
         if (useTls) {
-            curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_TRY);
+            curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_ALL);
         }
 
         if (!verifyPeer) {
@@ -147,8 +147,6 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
 bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteArray &server, const QByteArray &username, const QByteArray &password, const QByteArray &cacert, MailTransport::Options options)
 {
     QByteArray msg = message->encodedContent();
-    SinkLog() << "Sending message " << server << username << password << cacert;
-    SinkTrace() << "Sending message " << msg;
 
     QByteArray from(message->from(true)->mailboxes().isEmpty() ? QByteArray() : message->from(true)->mailboxes().first().address());
     QList<QByteArray> toList;
@@ -159,8 +157,11 @@ bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteA
     for (const auto &mb : message->cc(true)->mailboxes()) {
         ccList << mb.address();
     }
-    bool verifyPeer = options & VerifyPeers;
-    bool useTls = options & UseTls;
+    const bool verifyPeer = options.testFlag(VerifyPeers);
+    const bool useTls = options.testFlag(UseTls);
+
+    SinkLog() << "Sending message " << server << username << password << "CaCert: " << cacert  << "Use tls: " << useTls << " Verify peer: " << verifyPeer;
+    SinkTrace() << "Sending message " << msg;
 
     const int numTos = toList.size();
     const char* to[numTos];
@@ -173,6 +174,9 @@ bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteA
     for (int i = 0; i < numCcs; i++) {
         cc[i] = ccList.at(i);
     }
+    //Because curl will fail with smtps, but it won't tell you why.
+    auto serverAddress = server;
+    serverAddress.replace("smtps://", "smtp://");
 
-    return sendMessageCurl(to, numTos, cc, numCcs, msg, useTls, from.isEmpty() ? nullptr : from, username, password, server, verifyPeer, cacert);
+    return sendMessageCurl(to, numTos, cc, numCcs, msg, useTls, from.isEmpty() ? nullptr : from, username, password, serverAddress, verifyPeer, cacert);
 }
diff --git a/examples/mailtransportresource/mailtransport.h b/examples/mailtransportresource/mailtransport.h
index 3ef4a6d..662fdc9 100644
--- a/examples/mailtransportresource/mailtransport.h
+++ b/examples/mailtransportresource/mailtransport.h
@@ -26,8 +26,8 @@
 namespace MailTransport
 {
     enum Option {
-        UseTls,
-        VerifyPeers
+        UseTls = 1,
+        VerifyPeers = 2
     };
     Q_DECLARE_FLAGS(Options, Option);
 
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index 88a90c6..fa7eba4 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -77,7 +77,7 @@ public:
             } else {
                 MailTransport::Options options;
                 if (settings.server.contains("smtps")) {
-                    options &= MailTransport::UseTls;
+                    options |= MailTransport::UseTls;
                 }
                 if (!MailTransport::sendMessage(msg, settings.server.toUtf8(), settings.username.toUtf8(), settings.password.toUtf8(), settings.cacert.toUtf8(), options)) {
                     SinkWarning() << "Failed to send message: " << mail;