From efe76b2fc0298fcf1f72f013bba77862be809a29 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Sun, 12 Jun 2011 12:01:10 +0000 Subject: don't touch CA certificates unless asked to --- src/QXmppOutgoingClient.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/QXmppOutgoingClient.cpp') diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp index 8ad57b18..e35c4038 100644 --- a/src/QXmppOutgoingClient.cpp +++ b/src/QXmppOutgoingClient.cpp @@ -151,7 +151,10 @@ void QXmppOutgoingClient::connectToHost() const QString host = configuration().host(); const quint16 port = configuration().port(); - socket()->setCaCertificates(configuration().caCertificates()); + // override CA certificates if requested + if (!configuration().caCertificates().isEmpty()) { + socket()->setCaCertificates(configuration().caCertificates()); + } // if an explicit host was provided, connect to it if (!host.isEmpty() && port) -- cgit v1.2.3