diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2006-08-29 00:42:05 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2006-08-29 00:42:05 +0000 |
| commit | dd86a493ac4c2a1e25af91babf0869fa0ff868b7 (patch) | |
| tree | f4d411752944ba043b122311370f9ec52cdf7d2d /src | |
| parent | better handle startTls() if client not built with ssl (diff) | |
| download | inkscape-dd86a493ac4c2a1e25af91babf0869fa0ff868b7.tar.gz inkscape-dd86a493ac4c2a1e25af91babf0869fa0ff868b7.zip | |
better handle startTls() if client not built with ssl
(bzr r1655)
Diffstat (limited to 'src')
| -rw-r--r-- | src/pedro/pedroxmpp.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 = |