From b494cb88dd3c38b3d2f318a72ce6761847687289 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Sun, 27 Nov 2016 14:34:07 +0100 Subject: [PATCH] Make reloadCerts also handle the IPv6 server Closes GH-264. (cherry picked from commit 2bcdfeb7291667014106f6add98f8e7866bb1cc7) --- src/core/core.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index d36cabd2..450bc04c 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -431,8 +431,13 @@ bool Core::sslSupported() bool Core::reloadCerts() { #ifdef HAVE_SSL - SslServer *sslServer = qobject_cast(&instance()->_server); - return sslServer->reloadCerts(); + SslServer *sslServerv4 = qobject_cast(&instance()->_server); + bool retv4 = sslServerv4->reloadCerts(); + + SslServer *sslServerv6 = qobject_cast(&instance()->_v6server); + bool retv6 = sslServerv6->reloadCerts(); + + return retv4 && retv6; #else // SSL not supported, don't mark configuration reload as failed return true; -- 2.20.1