Make reloadCerts also handle the IPv6 server
authorWillem Jan Palenstijn <wjp@usecode.org>
Sun, 27 Nov 2016 13:34:07 +0000 (14:34 +0100)
committerManuel Nickschas <sputnick@quassel-irc.org>
Wed, 4 Apr 2018 21:14:03 +0000 (23:14 +0200)
Closes GH-264.

(cherry picked from commit 2bcdfeb7291667014106f6add98f8e7866bb1cc7)

src/core/core.cpp

index d36cabd..450bc04 100644 (file)
@@ -431,8 +431,13 @@ bool Core::sslSupported()
 bool Core::reloadCerts()
 {
 #ifdef HAVE_SSL
-    SslServer *sslServer = qobject_cast<SslServer *>(&instance()->_server);
-    return sslServer->reloadCerts();
+    SslServer *sslServerv4 = qobject_cast<SslServer *>(&instance()->_server);
+    bool retv4 = sslServerv4->reloadCerts();
+
+    SslServer *sslServerv6 = qobject_cast<SslServer *>(&instance()->_v6server);
+    bool retv6 = sslServerv6->reloadCerts();
+
+    return retv4 && retv6;
 #else
     // SSL not supported, don't mark configuration reload as failed
     return true;