~mdw
/
exim-config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base.m4, vhost.m4: Very hacky DH field-size limitation.
[exim-config]
/
spam.m4
diff --git
a/spam.m4
b/spam.m4
index
57b0c27
..
5d72365
100644
(file)
--- a/
spam.m4
+++ b/
spam.m4
@@
-43,19
+43,21
@@
fetch_spam_limit:
check_local_user
address_data = \
${if def:address_data {$address_data}{}} \
check_local_user
address_data = \
${if def:address_data {$address_data}{}} \
- ${if exists {CONF_userconf_dir/spam-limit} \
+ ${if and {{!eq{$acl_c_mode}{submission}} \
+ {exists {CONF_userconf_dir/spam-limit}}} \
{${lookup {$local_part_prefix\
$local_part\
$local_part_suffix\
@$domain/\
$sender_address} \
nwildlsearch {CONF_userconf_dir/spam-limit} \
{${lookup {$local_part_prefix\
$local_part\
$local_part_suffix\
@$domain/\
$sender_address} \
nwildlsearch {CONF_userconf_dir/spam-limit} \
- {${if match{$value}{\N^[0-9]+$\N} \
+ {${if match{$value}{\N^
-?
[0-9]+$\N} \
{spam_limit=$value} \
{}}} \
{}}} \
{}} \
{spam_limit=$value} \
{}}} \
{}}} \
{}} \
- ${if exists {CONF_userconf_dir/spam-limit.userv} \
+ ${if and {{!eq{$acl_c_mode}{submission}} \
+ {exists {CONF_userconf_dir/spam-limit.userv}}} \
{${run {timeout 5s -- \
userv $local_part exim-spam-limit \
$sender_address \
{${run {timeout 5s -- \
userv $local_part exim-spam-limit \
$sender_address \
@@
-63,7
+65,7
@@
fetch_spam_limit:
$local_part \
$local_part_suffix \
@$domain} \
$local_part \
$local_part_suffix \
@$domain} \
- {${if match{$value}{\N^[0-9]+$\N} \
+ {${if match{$value}{\N^
-?
[0-9]+$\N} \
{spam_limit=$value} \
{}}} \
{}}} \
{spam_limit=$value} \
{}}} \
{}}} \