X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.cpp;h=c7e1b351117f1c093f091b88903d903a0ee743cc;hp=343af5320949e23853f3253ee5608227e25c5acf;hb=034708a59ca1ee3195263a90941a2b145c520fef;hpb=a14eac175cceda16f50cb4519182f819cf7f6b23

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index 343af532..c7e1b351 100644
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -20,16 +20,17 @@
 
 #include "sslserver.h"
 
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
 #  include <QSslSocket>
 #endif
 
 #include <QFile>
 #include <QDebug>
 
+#include "logger.h"
 #include "util.h"
 
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
 
 SslServer::SslServer(QObject *parent)
   : QTcpServer(parent)
@@ -45,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!";
+    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.";
   }
 }
 
@@ -72,4 +73,4 @@ void SslServer::incomingConnection(int socketDescriptor) {
   }
 }
 
-#endif // QT_NO_OPENSSL
+#endif // HAVE_SSL