From 45276e8f7aa176eca70b969fcb09ff19ef9cb071 Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Sat, 25 Feb 2017 23:11:00 +0100
Subject: Cert: for servers using the cert/key specified in murmur.ini, also
 inherit its intermediates.

---
 src/murmur/Cert.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/murmur/Cert.cpp')

diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp
index 1be63a934..1e4706ea7 100644
--- a/src/murmur/Cert.cpp
+++ b/src/murmur/Cert.cpp
@@ -158,6 +158,7 @@ void Server::initializeCert() {
 	if (!qscCert.isNull() && issuer == QString::fromUtf8("Murmur Autogenerated Certificate v2") && ! Meta::mp.qscCert.isNull() && ! Meta::mp.qskKey.isNull() && (Meta::mp.qlBind == qlBind)) {
 		qscCert = Meta::mp.qscCert;
 		qskKey = Meta::mp.qskKey;
+		qlIntermediates = Meta::mp.qlIntermediates;
 	}
 
 	// If we still don't have a certificate by now, try to load the one from Meta
@@ -167,6 +168,7 @@ void Server::initializeCert() {
 		}
 		qskKey = Meta::mp.qskKey;
 		qscCert = Meta::mp.qscCert;
+		qlIntermediates = Meta::mp.qlIntermediates;
 
 		// If loading from Meta doesn't work, build+sign a new one
 		if (qscCert.isNull() || qskKey.isNull()) {
-- 
cgit v1.2.3