X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsslserver.cpp;h=46b8ee60909d2bbe817be60b50a55af832359b13;hb=86831c8857f0a729580cee547e10c9621d50c780;hp=b19ee5fb2de1f71b19503702531b20b0f90c4d7f;hpb=9a36f8e55bfa485467e093fba669841fdfacda2f;p=quassel.git

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index b19ee5fb..46b8ee60 100644
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,16 +18,20 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef QT_NO_OPENSSL
-
 #include "sslserver.h"
 
-#include <QSslSocket>
+#ifdef HAVE_SSL
+#  include <QSslSocket>
+#endif
+
 #include <QFile>
 #include <QDebug>
 
+#include "logger.h"
 #include "util.h"
 
+#ifdef HAVE_SSL
+
 SslServer::SslServer(QObject *parent)
   : QTcpServer(parent)
 {
@@ -42,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.";
   }
 }
 
@@ -69,4 +73,4 @@ void SslServer::incomingConnection(int socketDescriptor) {
   }
 }
 
-#endif // QT_NO_OPENSSL
+#endif // HAVE_SSL