X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsslserver.cpp;h=307c46ba72e12c979c5fca13faadc6d8f20065f8;hb=cb1b16fce88b240c735b942aad44a61a1dd3f28d;hp=b007a65f4f58c59c2e6135a04080a6df9b97098f;hpb=3d5ff3b49a93a3f375b6b454088caafec751dfb6;p=quassel.git

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index b007a65f..307c46ba 100644
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -20,12 +20,18 @@
 
 #include "sslserver.h"
 
-#include <QSslSocket>
+#ifndef QT_NO_OPENSSL
+#  include <QSslSocket>
+#endif
+
 #include <QFile>
 #include <QDebug>
 
+#include "logger.h"
 #include "util.h"
 
+#ifndef QT_NO_OPENSSL
+
 SslServer::SslServer(QObject *parent)
   : QTcpServer(parent)
 {
@@ -40,9 +46,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!";
+    quWarning() << "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 +72,5 @@ void SslServer::incomingConnection(int socketDescriptor) {
     delete serverSocket;
   }
 }
+
+#endif // QT_NO_OPENSSL