From: ishmal <ishmal@users.sourceforge.net>
Date: Tue, 29 Aug 2006 00:42:05 +0000 (+0000)
Subject: better handle startTls() if client not built with ssl
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ae459381b75891d05673c206a4487d99560e0e69;p=inkscape.git

better handle startTls() if client not built with ssl
---

diff --git a/src/pedro/pedroxmpp.cpp b/src/pedro/pedroxmpp.cpp
index 398e6722b..17c7ef3ba 100644
--- a/src/pedro/pedroxmpp.cpp
+++ b/src/pedro/pedroxmpp.cpp
@@ -2050,7 +2050,9 @@ bool XmppClient::saslAuthenticate()
             status("login: STARTTLS available");
         }
 
-    if (wantStartTls && !sock->getEnableSSL())
+    //# do we want TLS, are we not already running SSL, and can
+    //# the client actually do an ssl connection?
+    if (wantStartTls && !sock->getEnableSSL() && sock->getHaveSSL())
         {
         delete elem;
         char *fmt =