X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.cpp;h=5a61a31b740e38f305d600d31b8dd8174f88da33;hp=b007a65f4f58c59c2e6135a04080a6df9b97098f;hb=bf01681e9e6108517bfa997422b84e04b801a40a;hpb=3d5ff3b49a93a3f375b6b454088caafec751dfb6 diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp index b007a65f..5a61a31b 100644 --- a/src/core/sslserver.cpp +++ b/src/core/sslserver.cpp @@ -20,12 +20,17 @@ #include "sslserver.h" -#include +#ifndef QT_NO_OPENSSL +# include +#endif + #include #include #include "util.h" +#ifndef QT_NO_OPENSSL + SslServer::SslServer(QObject *parent) : QTcpServer(parent) { @@ -40,9 +45,9 @@ SslServer::SslServer(QObject *parent) _certIsValid = !_cert.isNull() && _cert.isValid() && !_key.isNull(); if(!_certIsValid) { - qWarning() << "SslServer: SSL Certificate is either missing or has wrong format!"; - qWarning() << " make sure that ~/.quassel/quasselCert.pem is pem format and contains the cert and an rsa key!"; - qWarning() << "SslServer: this Quassel Core cannot provide SSL!"; + qWarning() << "SslServer: SSL Certificate is either missing or has a wrong format!\n" + << " Quassel Core will still work, but cannot provide SSL for client connections.\n" + << " Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support."; } } @@ -66,3 +71,5 @@ void SslServer::incomingConnection(int socketDescriptor) { delete serverSocket; } } + +#endif // QT_NO_OPENSSL