From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 31 Oct 2017 21:24:17 +0000 (+0200)
Subject: lib-master: master_service_ssl_settings_to_iostream_set() - reorder assignments
X-Git-Tag: 2.3.0.rc1~530
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ca7d305e0fd5b2282172ee9cc7a9fb3ff38b7fc;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: master_service_ssl_settings_to_iostream_set() - reorder assignments

Keep them in the same order as the fields in struct ssl_iostream_settings,
so it's easier to verify whether all fields are listed.
---

diff --git a/src/lib-master/master-service-ssl-settings.c b/src/lib-master/master-service-ssl-settings.c
index 623967bf27..6825c531bd 100644
--- a/src/lib-master/master-service-ssl-settings.c
+++ b/src/lib-master/master-service-ssl-settings.c
@@ -178,8 +178,20 @@ master_service_ssl_settings_to_iostream_set(const struct master_service_ssl_sett
 	set_r->protocols = p_strdup(pool, ssl_set->ssl_protocols);
 	set_r->cipher_list = p_strdup(pool, ssl_set->ssl_cipher_list);
 	set_r->ca = p_strdup(pool, ssl_set->ssl_ca);
+
+	set_r->cert.cert = p_strdup(pool, ssl_set->ssl_cert);
+	set_r->cert.key = p_strdup(pool, ssl_set->ssl_key);
+	set_r->cert.key_password = p_strdup(pool, ssl_set->ssl_key_password);
+	if (ssl_set->ssl_alt_cert != NULL && *ssl_set->ssl_alt_cert != '\0') {
+		set_r->alt_cert.cert = p_strdup(pool, ssl_set->ssl_alt_cert);
+		set_r->alt_cert.key = p_strdup(pool, ssl_set->ssl_alt_key);
+		set_r->alt_cert.key_password = p_strdup(pool, ssl_set->ssl_key_password);
+	}
+
 	set_r->dh = p_strdup(pool, ssl_set->ssl_dh);
 	set_r->crypto_device = p_strdup(pool, ssl_set->ssl_crypto_device);
+	set_r->cert_username_field = p_strdup(pool, ssl_set->ssl_cert_username_field);
+
 	set_r->verbose = ssl_set->verbose_ssl;
 	set_r->verbose_invalid_cert = ssl_set->verbose_ssl;
 	set_r->skip_crl_check = !ssl_set->ssl_require_crl;
@@ -188,13 +200,4 @@ master_service_ssl_settings_to_iostream_set(const struct master_service_ssl_sett
 	set_r->prefer_server_ciphers = ssl_set->ssl_prefer_server_ciphers;
 	set_r->compression = ssl_set->parsed_opts.compression;
 	set_r->tickets = ssl_set->parsed_opts.tickets;
-	set_r->cert.cert = p_strdup(pool, ssl_set->ssl_cert);
-	set_r->cert.key = p_strdup(pool, ssl_set->ssl_key);
-	set_r->cert.key_password = p_strdup(pool, ssl_set->ssl_key_password);
-	if (ssl_set->ssl_alt_cert != NULL && *ssl_set->ssl_alt_cert != '\0') {
-		set_r->alt_cert.cert = p_strdup(pool, ssl_set->ssl_alt_cert);
-		set_r->alt_cert.key = p_strdup(pool, ssl_set->ssl_alt_key);
-		set_r->alt_cert.key_password = p_strdup(pool, ssl_set->ssl_key_password);
-	}
-	set_r->cert_username_field = p_strdup(pool, ssl_set->ssl_cert_username_field);
 }