From ee4cb61d399a1b755b2da5f3ed7ccabf57091ace Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 20 Jun 2017 11:26:02 +0200
Subject: [PATCH] The !SSLv2 option for Dovecot 2.2 has been removed
---
install/dist/lib/debian60.lib.php | 4 ++++
install/lib/installer_base.lib.php | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index e24993056a..57fb193440 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -109,6 +109,10 @@ class installer extends installer_base {
if(version_compare($dovecot_version,2.1) < 0) {
removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
}
+ if(version_compare($dovecot_version,2.2) >= 0) {
+ // Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
+ replaceLine($config_dir.'/'.$configfile, 'ssl_protocols = !SSLv2 !SSLv3', 'ssl_protocols = !SSLv3', 1, 0);
+ }
} else {
if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master')) {
copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master', $config_dir.'/'.$configfile);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index f2c89fb0bf..d339e5f87a 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1270,6 +1270,10 @@ class installer_base {
if(version_compare($dovecot_version, 2.1, '<')) {
removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
}
+ if(version_compare($dovecot_version,2.2) >= 0) {
+ // Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
+ replaceLine($config_dir.'/'.$configfile, 'ssl_protocols = !SSLv2 !SSLv3', 'ssl_protocols = !SSLv3', 1, 0);
+ }
}
//* dovecot-lmtpd
--
GitLab