Improved dovecot config file editing.

Till Brehm · Till Brehm · commit 90ce11e0ff6e · 2018-02-22T16:47:08.000+01:00
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
@@ -111,7 +111,10 @@ public function configure_dovecot()
 			}
 			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);
+				$content = file_get_contents($config_dir.'/'.$configfile);
+				$content = str_replace('!SSLv2','',$content);
+				file_put_contents($config_dir.'/'.$configfile,$content);
+				unset($content);
 			}
 		} else {
 			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master')) {
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -443,6 +443,13 @@ public function configure_dovecot()
 			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
+				$content = file_get_contents($config_dir.'/'.$configfile);
+				$content = str_replace('!SSLv2','',$content);
+				file_put_contents($config_dir.'/'.$configfile,$content);
+				unset($content);
+			}
 			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 		} else {
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1292,7 +1292,10 @@ public function configure_dovecot() {
 			}
 			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);
+				$content = file_get_contents($config_dir.'/'.$configfile);
+				$content = str_replace('!SSLv2','',$content);
+				file_put_contents($config_dir.'/'.$configfile,$content);
+				unset($content);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,10 @@ public function configure_dovecot()`
`111`	`111`	`}`
`112`	`112`	`if(version_compare($dovecot_version,2.2) >= 0) {`
`113`	`113`	`// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9`
`114`		`- replaceLine($config_dir.'/'.$configfile, 'ssl_protocols = !SSLv2 !SSLv3', 'ssl_protocols = !SSLv3', 1, 0);`
	`114`	`+ $content = file_get_contents($config_dir.'/'.$configfile);`
	`115`	`+ $content = str_replace('!SSLv2','',$content);`
	`116`	`+ file_put_contents($config_dir.'/'.$configfile,$content);`
	`117`	`+ unset($content);`
`115`	`118`	`}`
`116`	`119`	`} else {`
`117`	`120`	`if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master')) {`
Original file line number	Diff line number	Diff line change
`@@ -1292,7 +1292,10 @@ public function configure_dovecot() {`
`1292`	`1292`	`}`
`1293`	`1293`	`if(version_compare($dovecot_version,2.2) >= 0) {`
`1294`	`1294`	`// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9`
`1295`		`- replaceLine($config_dir.'/'.$configfile, 'ssl_protocols = !SSLv2 !SSLv3', 'ssl_protocols = !SSLv3', 1, 0);`
	`1295`	`+ $content = file_get_contents($config_dir.'/'.$configfile);`
	`1296`	`+ $content = str_replace('!SSLv2','',$content);`
	`1297`	`+ file_put_contents($config_dir.'/'.$configfile,$content);`
	`1298`	`+ unset($content);`
`1296`	`1299`	`}`
`1297`	`1300`	`}`
`1298`	`1301`