projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
feb81a0
)
Make reloadCerts also handle the IPv6 server
author
Willem Jan Palenstijn
<wjp@usecode.org>
Sun, 27 Nov 2016 13:34:07 +0000
(14:34 +0100)
committer
Daniel Albers
<daniel@lbe.rs>
Sun, 25 Dec 2016 13:47:42 +0000
(14:47 +0100)
Closes GH-264.
src/core/core.cpp
patch
|
blob
|
history
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
11db682
..
b5bea2c
100644
(file)
--- a/
src/core/core.cpp
+++ b/
src/core/core.cpp
@@
-431,8
+431,13
@@
bool Core::sslSupported()
bool Core::reloadCerts()
{
#ifdef HAVE_SSL
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;
#else
// SSL not supported, don't mark configuration reload as failed
return true;