Fixed #5214 relayhost without authentication

Till Brehm · Till Brehm · commit 38751c07808d · 2019-01-08T10:22:40.000+01:00
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
@@ -89,7 +89,7 @@ function update($event_name, $data) {
 			$content = file_exists('/etc/postfix/sasl_passwd') ? file_get_contents('/etc/postfix/sasl_passwd') : '';
 			$content = preg_replace('/^'.preg_quote($old_ini_data['email']['relayhost']).'\s+[^\n]*(:?\n|)/m','',$content);
 
-			if (!empty($mail_config['relayhost']) || !empty($mail_config['relayhost_user']) || !empty($mail_config['relayhost_password'])) {
+			if (!empty($mail_config['relayhost_user']) || !empty($mail_config['relayhost_password'])) {
 				$content .= "\n".$mail_config['relayhost'].'   '.$mail_config['relayhost_user'].':'.$mail_config['relayhost_password'];
 			}
 			

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ function update($event_name, $data) {`
`89`	`89`	`$content = file_exists('/etc/postfix/sasl_passwd') ? file_get_contents('/etc/postfix/sasl_passwd') : '';`
`90`	`90`	`$content = preg_replace('/^'.preg_quote($old_ini_data['email']['relayhost']).'\s+[^\n]*(:?\n\|)/m','',$content);`
`91`	`91`
`92`		`- if (!empty($mail_config['relayhost']) \|\| !empty($mail_config['relayhost_user']) \|\| !empty($mail_config['relayhost_password'])) {`
	`92`	`+ if (!empty($mail_config['relayhost_user']) \|\| !empty($mail_config['relayhost_password'])) {`
`93`	`93`	`$content .= "\n".$mail_config['relayhost'].' '.$mail_config['relayhost_user'].':'.$mail_config['relayhost_password'];`
`94`	`94`	`}`
`95`	`95`