reject_sender_login_mismatch (not reject_authenticated_sender_login_mismatch)

jnorell · jnorell · commit cde635c13a28 · 2020-08-19T09:47:18.000-06:00
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -154,7 +154,7 @@ function configure_postfix($options = '')
 
 		$reject_sender_login_mismatch = '';
 		if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
-			$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
+			$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
 		}
 		unset($server_ini_array);
 
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
@@ -103,7 +103,7 @@ public function configure_postfix($options = '')
 
 		$reject_sender_login_mismatch = '';
 		if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
-			$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
+			$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
 		}
 		unset($server_ini_array);
 
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -165,7 +165,7 @@ function configure_postfix($options = '')
 
 		$reject_sender_login_mismatch = '';
 		if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
-			$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
+			$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
 		}
 		unset($server_ini_array);
 
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1078,7 +1078,7 @@ public function configure_postfix($options = '') {
 
 		$reject_sender_login_mismatch = '';
 		if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
-			$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
+			$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
 		}
 		unset($server_ini_array);
 
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
@@ -146,7 +146,7 @@ function update($event_name, $data) {
 			$options = preg_split("/,\s*/", exec("postconf -h smtpd_sender_restrictions"));
 			$new_options = array();
 			foreach ($options as $key => $value) {
-				if (!preg_match('/reject_authenticated_sender_login_mismatch/', $value)) {
+				if (!preg_match('/reject_(authenticated_)?sender_login_mismatch/', $value)) {
 					$new_options[] = $value;
 				}
 			}
@@ -155,7 +155,7 @@ function update($event_name, $data) {
 				reset($new_options); $i = 0;
 				// insert after check_sender_access but before permit_...
 				while (isset($new_options[$i]) && substr($new_options[$i], 0, 19) == 'check_sender_access') ++$i;
-				array_splice($new_options, $i, 0, array('reject_authenticated_sender_login_mismatch'));
+				array_splice($new_options, $i, 0, array('reject_sender_login_mismatch'));
 			}
 			$app->system->exec_safe("postconf -e ?", 'smtpd_sender_restrictions = '.implode(", ", $new_options));
 			exec('postfix reload');

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ function configure_postfix($options = '')`
`154`	`154`
`155`	`155`	`$reject_sender_login_mismatch = '';`
`156`	`156`	`if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {`
`157`		`- $reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';`
	`157`	`+ $reject_sender_login_mismatch = ', reject_sender_login_mismatch';`
`158`	`158`	`}`
`159`	`159`	`unset($server_ini_array);`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function configure_postfix($options = '')`
`103`	`103`
`104`	`104`	`$reject_sender_login_mismatch = '';`
`105`	`105`	`if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {`
`106`		`- $reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';`
	`106`	`+ $reject_sender_login_mismatch = ', reject_sender_login_mismatch';`
`107`	`107`	`}`
`108`	`108`	`unset($server_ini_array);`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ function configure_postfix($options = '')`
`165`	`165`
`166`	`166`	`$reject_sender_login_mismatch = '';`
`167`	`167`	`if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {`
`168`		`- $reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';`
	`168`	`+ $reject_sender_login_mismatch = ', reject_sender_login_mismatch';`
`169`	`169`	`}`
`170`	`170`	`unset($server_ini_array);`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -1078,7 +1078,7 @@ public function configure_postfix($options = '') {`
`1078`	`1078`
`1079`	`1079`	`$reject_sender_login_mismatch = '';`
`1080`	`1080`	`if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {`
`1081`		`- $reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';`
	`1081`	`+ $reject_sender_login_mismatch = ', reject_sender_login_mismatch';`
`1082`	`1082`	`}`
`1083`	`1083`	`unset($server_ini_array);`
`1084`	`1084`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ function update($event_name, $data) {`
`146`	`146`	`$options = preg_split("/,\s*/", exec("postconf -h smtpd_sender_restrictions"));`
`147`	`147`	`$new_options = array();`
`148`	`148`	`foreach ($options as $key => $value) {`
`149`		`- if (!preg_match('/reject_authenticated_sender_login_mismatch/', $value)) {`
	`149`	`+ if (!preg_match('/reject_(authenticated_)?sender_login_mismatch/', $value)) {`
`150`	`150`	`$new_options[] = $value;`
`151`	`151`	`}`
`152`	`152`	`}`
`@@ -155,7 +155,7 @@ function update($event_name, $data) {`
`155`	`155`	`reset($new_options); $i = 0;`
`156`	`156`	`// insert after check_sender_access but before permit_...`
`157`	`157`	`while (isset($new_options[$i]) && substr($new_options[$i], 0, 19) == 'check_sender_access') ++$i;`
`158`		`- array_splice($new_options, $i, 0, array('reject_authenticated_sender_login_mismatch'));`
	`158`	`+ array_splice($new_options, $i, 0, array('reject_sender_login_mismatch'));`
`159`	`159`	`}`
`160`	`160`	`$app->system->exec_safe("postconf -e ?", 'smtpd_sender_restrictions = '.implode(", ", $new_options));`
`161`	`161`	`exec('postfix reload');`