Merge branch '5889-place-reject_rbl_client-after-permit_sasl_authenticated-in-postfix-config' into 'develop'

Marius Burkard · Marius Burkard · commit 99a3cb483641 · 2021-12-21T10:37:40.000Z
Resolve "Place reject_rbl_client after permit_sasl_authenticated in postfix config"

Closes #5889

See merge request ispconfig/ispconfig3!1531
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
@@ -138,7 +138,7 @@ function update($event_name, $data) {
 				if ($value == '') continue;
 				if (preg_match('/^reject_rbl_client/', $value)) continue;
 				$new_options[] = $value;
-				if (preg_match('/^permit_mynetworks/', $value)) {
+				if (preg_match('/^permit_sasl_authenticated/', $value)) {
 					$new_options = array_merge($new_options, $rbl_options);
 					$rbl_options = array(); // so we don't ever array_merge twice
 				}

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ function update($event_name, $data) {`
`138`	`138`	`if ($value == '') continue;`
`139`	`139`	`if (preg_match('/^reject_rbl_client/', $value)) continue;`
`140`	`140`	`$new_options[] = $value;`
`141`		`- if (preg_match('/^permit_mynetworks/', $value)) {`
	`141`	`+ if (preg_match('/^permit_sasl_authenticated/', $value)) {`
`142`	`142`	`$new_options = array_merge($new_options, $rbl_options);`
`143`	`143`	`$rbl_options = array(); // so we don't ever array_merge twice`
`144`	`144`	`}`