diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2006-05-21 21:14:09 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2006-05-21 21:14:09 +0000 |
| commit | 1434818f7c7fff0c1258f44b14e925951fe2b66c (patch) | |
| tree | 5d10ed6e5ac39f5ad32cea5ec5b1b517b2251692 /src/pedro/pedroxmpp.cpp | |
| parent | Added 'Show close button on dialogs' option. (diff) | |
| download | inkscape-1434818f7c7fff0c1258f44b14e925951fe2b66c.tar.gz inkscape-1434818f7c7fff0c1258f44b14e925951fe2b66c.zip | |
Check if we are already SSL before trying STARTTLS
(bzr r927)
Diffstat (limited to 'src/pedro/pedroxmpp.cpp')
| -rw-r--r-- | src/pedro/pedroxmpp.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/pedro/pedroxmpp.cpp b/src/pedro/pedroxmpp.cpp index f447b9356..6bce6c10e 100644 --- a/src/pedro/pedroxmpp.cpp +++ b/src/pedro/pedroxmpp.cpp @@ -1146,6 +1146,8 @@ public: void enableSSL(bool val); + bool getEnableSSL(); + bool connect(const std::string &hostname, int portno); bool connect(const char *hostname, int portno); @@ -1376,6 +1378,11 @@ void TcpSocket::enableSSL(bool val) sslEnabled = val; } +bool TcpSocket::getEnableSSL() +{ + return sslEnabled; +} + bool TcpSocket::connect(const char *hostnameArg, int portnoArg) { @@ -3477,7 +3484,7 @@ bool XmppClient::saslAuthenticate() status("login: STARTTLS available"); } - if (wantStartTls) + if (wantStartTls && !sock->getEnableSSL()) { delete elem; char *fmt = |