projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssl: Remove fallback code for missing SSL support
[quassel.git]
/
src
/
core
/
core.cpp
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
a2b7283
..
66e2e62
100644
(file)
--- a/
src/core/core.cpp
+++ b/
src/core/core.cpp
@@
-215,10
+215,8
@@
void Core::init()
if (Quassel::isOptionSet("metrics-daemon")) {
_metricsServer = new MetricsServer(this);
if (Quassel::isOptionSet("metrics-daemon")) {
_metricsServer = new MetricsServer(this);
-#ifdef HAVE_SSL
_server.setMetricsServer(_metricsServer);
_v6server.setMetricsServer(_metricsServer);
_server.setMetricsServer(_metricsServer);
_v6server.setMetricsServer(_metricsServer);
-#endif
}
Quassel::registerReloadHandler([]() {
}
Quassel::registerReloadHandler([]() {
@@
-574,17
+572,12
@@
bool Core::initAuthenticator(
bool Core::sslSupported()
{
bool Core::sslSupported()
{
-#ifdef HAVE_SSL
auto* sslServer = qobject_cast<SslServer*>(&instance()->_server);
return sslServer && sslServer->isCertValid();
auto* sslServer = qobject_cast<SslServer*>(&instance()->_server);
return sslServer && sslServer->isCertValid();
-#else
- return false;
-#endif
}
bool Core::reloadCerts()
{
}
bool Core::reloadCerts()
{
-#ifdef HAVE_SSL
auto* sslServerv4 = qobject_cast<SslServer*>(&_server);
bool retv4 = sslServerv4->reloadCerts();
auto* sslServerv4 = qobject_cast<SslServer*>(&_server);
bool retv4 = sslServerv4->reloadCerts();
@@
-592,10
+585,6
@@
bool Core::reloadCerts()
bool retv6 = sslServerv6->reloadCerts();
return retv4 && retv6;
bool retv6 = sslServerv6->reloadCerts();
return retv4 && retv6;
-#else
- // SSL not supported, don't mark configuration reload as failed
- return true;
-#endif
}
void Core::cacheSysIdent()
}
void Core::cacheSysIdent()