Code

better handle startTls() if client not built with ssl
authorishmal <ishmal@users.sourceforge.net>
Tue, 29 Aug 2006 00:42:05 +0000 (00:42 +0000)
committerishmal <ishmal@users.sourceforge.net>
Tue, 29 Aug 2006 00:42:05 +0000 (00:42 +0000)
src/pedro/pedroxmpp.cpp

index 398e6722bab97ce8a42b90c94138c292fee48ec4..17c7ef3ba94e97e12118272ca4357328d947bd9e 100644 (file)
@@ -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 =