From cde635c13a28dc81806e0348181766a80c13802e Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Tue, 28 Apr 2020 14:15:40 -0600
Subject: [PATCH] reject_sender_login_mismatch (not
reject_authenticated_sender_login_mismatch)
---
install/dist/lib/fedora.lib.php | 2 +-
install/dist/lib/gentoo.lib.php | 2 +-
install/dist/lib/opensuse.lib.php | 2 +-
install/lib/installer_base.lib.php | 2 +-
server/plugins-available/postfix_server_plugin.inc.php | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index c188ac93a5..27962691f5 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -154,7 +154,7 @@ class installer_dist extends installer_base {
$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
index 324fe06e9a..0e8238d57e 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -103,7 +103,7 @@ class installer extends installer_base
$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
index da31ad6b57..21be53d975 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -165,7 +165,7 @@ class installer_dist extends installer_base {
$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
index ab49b6753e..c7c63e1dab 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1078,7 +1078,7 @@ class installer_base {
$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
index 46369d2ed1..4795226d35 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -146,7 +146,7 @@ class postfix_server_plugin {
$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 @@ class postfix_server_plugin {
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');
--
GitLab