From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 31 Oct 2017 08:10:39 +0000 (+0200)
Subject: lib-master: Support alternative cert in master_service_ssl_ctx_init
X-Git-Tag: 2.3.0.rc1~677
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15707468f4889e9fee15ae8dd7ddc302b174949a;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Support alternative cert in master_service_ssl_ctx_init
---

diff --git a/src/lib-master/master-service-ssl.c b/src/lib-master/master-service-ssl.c
index 2cfdbb2d06..0931bb6ffb 100644
--- a/src/lib-master/master-service-ssl.c
+++ b/src/lib-master/master-service-ssl.c
@@ -70,6 +70,11 @@ void master_service_ssl_ctx_init(struct master_service *service)
 	ssl_set.dh = set->ssl_dh;
 	ssl_set.cert.key_password = set->ssl_key_password;
 	ssl_set.cert_username_field = set->ssl_cert_username_field;
+	if (set->ssl_alt_cert != NULL && *set->ssl_alt_cert != '\0') {
+		ssl_set.alt_cert.cert = set->ssl_alt_cert;
+		ssl_set.alt_cert.key = set->ssl_alt_key;
+		ssl_set.alt_cert.key_password = set->ssl_key_password;
+	}
 	ssl_set.crypto_device = set->ssl_crypto_device;
 
 	ssl_set.verbose = set->verbose_ssl;