Fixed master.cf service detection for old postfix versions.

33ec98b9 · Till Brehm · 0e11113b · 33ec98b9
Commit 33ec98b9 authored Jul 28, 2016 by Till Brehm
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

install/lib/installer_base.lib.php install/lib/installer_base.lib.php +2 -2

No files found.
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -823,8 +823,8 @@ class installer_base {
 			$postfix_service = @($out[0]=='')?false:true;
        } else { //* fallback - Postfix < 2.9
 			$content = rf($conf['postfix']['config_dir'].'/master.cf');
-			$regex = '/[^#]'.$service.'.*.'.$type.'.*/';
+			$regex = "/^((?!#)".$service.".*".$type.".*)$/m"; 
-			$postfix_service = @(!preg_match($regex, $content))?true:false;
+			$postfix_service = @(preg_match($regex, $content))?true:false;
 		}
 		return $postfix_service;