From: Joshua T Corbin <jcorbin@wunjo.org>
Date: Thu, 8 Jan 2009 23:52:58 +0000 (-0500)
Subject: Precise error messages in SslServer::setCertificate.
X-Git-Tag: 0.4.0~203
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=5dafdaccc84bc3fa0a9fafa7c594e08a58aa02d4;hp=fe1d4d5399d9dc215c6c0cb5527c9b24b367158f

Precise error messages in SslServer::setCertificate.
---

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index 8006ebdb..2557f2ff 100644
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -88,13 +88,20 @@ bool SslServer::setCertificate(const QString &path) {
   _key = QSslKey(&certFile, QSsl::Rsa);
   certFile.close();
 
-  if(_cert.isNull() || !_cert.isValid() || _key.isNull()) {
-    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.";
-  } else {
-    _certIsValid = true;
+  if (_cert.isNull()) {
+    qWarning() << "SslServer:" << qPrintable(path) << "contains no certificate data";
+    return false;
+  }
+  if (! _cert.isValid()) {
+    qWarning() << "SslServer: Invalid certificate";
+    return false;
   }
+  if (_key.isNull()) {
+    qWarning() << "SslServer:" << qPrintable(path) << "contains no key data";
+    return false;
+  }
+
+  _certIsValid = true;
 
   return _certIsValid;
 }