Server: add bUsingMetaCert flag.

This flag is necessary for hot certificate reload.

We need to know which servers are using the Meta certificate/key,
since we will only be able to live-reload SSL settings via SIGUSR1
for those servers. Servers that use their own SSL certificate/key
can't be reloaded via the SIGUSR1 mechanism.

This is because servers that use their own SSL certificate/key store
them in the database. Thus, it is only possible to update those via
RPC using the updateCertificate() method.

3 files changed, 11 insertions, 0 deletions

diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp
index 1e4706ea7..8b9c7fbda 100644
--- a/src/murmur/Cert.cpp
+++ b/src/murmur/Cert.cpp
@@ -159,6 +159,10 @@ void Server::initializeCert() {
 		qscCert = Meta::mp.qscCert;
 		qskKey = Meta::mp.qskKey;
 		qlIntermediates = Meta::mp.qlIntermediates;
+
+		if (!qscCert.isNull() && !qskKey.isNull()) {
+			bUsingMetaCert = true;
+		}
 	}
 
 	// If we still don't have a certificate by now, try to load the one from Meta
@@ -166,10 +170,15 @@ void Server::initializeCert() {
 		if (! key.isEmpty() || ! crt.isEmpty()) {
 			log("Certificate specified, but failed to load.");
 		}
+
 		qskKey = Meta::mp.qskKey;
 		qscCert = Meta::mp.qscCert;
 		qlIntermediates = Meta::mp.qlIntermediates;
 
+		if (!qscCert.isNull() && !qskKey.isNull()) {
+			bUsingMetaCert = true;
+		}
+
 		// If loading from Meta doesn't work, build+sign a new one
 		if (qscCert.isNull() || qskKey.isNull()) {
 			log("Generating new server certificate.");
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index 7bb08c848..19c7a9a2c 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -100,6 +100,7 @@ Server::Server(int snum, QObject *p) : QThread(p) {
 #ifdef USE_BONJOUR
 	bsRegistration = NULL;
 #endif
+	bUsingMetaCert = false;
 
 #ifdef Q_OS_UNIX
 	aiNotify[0] = aiNotify[1] = -1;
diff --git a/src/murmur/Server.h b/src/murmur/Server.h
index f3d51c522..7a1a4bd75 100644
--- a/src/murmur/Server.h
+++ b/src/murmur/Server.h
@@ -131,6 +131,7 @@ class Server : public QThread {
 		QVariant qvSuggestPositional;
 		QVariant qvSuggestPushToTalk;
 
+		bool bUsingMetaCert;
 		QSslCertificate qscCert;
 		QSslKey qskKey;