Commit 92fc3734 authored by Till Brehm's avatar Till Brehm

Merge branch 'no_addr_verify_for_rspamd' into 'develop'

no need to verify recipient addresses for rspamd

See merge request !1224
parents fdca0dbc 1110abef
......@@ -391,6 +391,9 @@ class installer_base {
}
}
// preserve needed values in $conf (should just array_merge $tpl_ini_array into $conf?)
$conf['mail']['content_filter'] = $tpl_ini_array['mail']['content_filter'];
$server_ini_content = array_to_ini($tpl_ini_array);
$mail_server_enabled = ($conf['services']['mail'])?1:0;
......@@ -1475,7 +1478,7 @@ class installer_base {
}
$new_options[] = $value;
}
if ($configure_lmtp) {
if ($configure_lmtp && $conf['mail']['content_filter'] === 'amavisd') {
for ($i = 0; isset($new_options[$i]); $i++) {
if ($new_options[$i] == 'reject_unlisted_recipient') {
array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:${quoted_config_dir}/mysql-verify_recipients.cf"));
......
......@@ -326,7 +326,7 @@ class postfix_server_plugin {
}
$new_options[] = $value;
}
if (defined($configure_lmtp) && $configure_lmtp) {
if (defined($configure_lmtp) && $configure_lmtp && $mail_config['content_filter'] == 'amavisd') {
for ($i = 0; isset($new_options[$i]); $i++) {
if ($new_options[$i] == 'reject_unlisted_recipient') {
array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:${quoted_postfix_config_dir}/mysql-verify_recipients.cf"));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment