Merge branch 'seezer'

[quassel.git] / src / core / sslserver.cpp

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index b19ee5f..5a61a31 100644 (file)
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -18,16 +18,19 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef QT_NO_OPENSSL
-
 #include "sslserver.h"
 
-#include <QSslSocket>
+#ifndef QT_NO_OPENSSL
+#  include <QSslSocket>
+#endif
+
 #include <QFile>
 #include <QDebug>
 
 #include "util.h"
 
+#ifndef QT_NO_OPENSSL
+
 SslServer::SslServer(QObject *parent)
   : QTcpServer(parent)
 {
@@ -42,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.";
   }
 }