From: Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Date: Tue, 29 Nov 2016 07:38:21 +0000 (+0200)
Subject: ssl: deprecate no_compression in ssl_options
X-Git-Tag: 2.3.0.rc1~1867
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7dd7e8ed41c2da4d76cc80597c253b9f0e75603b;p=thirdparty%2Fdovecot%2Fcore.git

ssl: deprecate no_compression in ssl_options

Compression is now disabled by default.
---

diff --git a/doc/example-config/conf.d/10-ssl.conf b/doc/example-config/conf.d/10-ssl.conf
index f3006ff7c2..a9a58e0938 100644
--- a/doc/example-config/conf.d/10-ssl.conf
+++ b/doc/example-config/conf.d/10-ssl.conf
@@ -68,6 +68,6 @@ ssl_key = </etc/ssl/private/dovecot.pem
 #ssl_crypto_device =
 
 # SSL extra options. Currently supported options are:
-#   no_compression - Disable compression.
+#   compression - Enable compression.
 #   no_ticket - Disable SSL session tickets.
 #ssl_options =
diff --git a/src/lib-master/master-service-ssl-settings.c b/src/lib-master/master-service-ssl-settings.c
index 1a3c4f7d8a..2427938fe7 100644
--- a/src/lib-master/master-service-ssl-settings.c
+++ b/src/lib-master/master-service-ssl-settings.c
@@ -115,15 +115,20 @@ master_service_ssl_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 
 	/* Now explode the ssl_options string into individual flags */
 	/* First set them all to defaults */
-	set->parsed_opts.compression = TRUE;
+	set->parsed_opts.compression = FALSE;
 	set->parsed_opts.tickets = TRUE;
 
 	/* Then modify anything specified in the string */
 	const char **opts = t_strsplit_spaces(set->ssl_options, ", ");
 	const char *opt;
 	while ((opt = *opts++) != NULL) {
-		if (strcasecmp(opt, "no_compression") == 0) {
-			set->parsed_opts.compression = FALSE;
+		if (strcasecmp(opt, "compression") == 0) {
+			set->parsed_opts.compression = TRUE;
+		} else if (strcasecmp(opt, "no_compression") == 0) {
+#ifdef CONFIG_BINARY
+			i_warning("DEPRECATED: no_compression is default, "
+				  "so it is redundant in ssl_options");
+#endif
 		} else if (strcasecmp(opt, "no_ticket") == 0) {
 			set->parsed_opts.tickets = FALSE;
 		} else {