X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/b8b0f13c28bdc666f939568fec998d0fa2f1e379..8fca6182bd0b3b877ccca2e90b75c99e75f1008e:/spam.m4

diff --git a/spam.m4 b/spam.m4
index e480880..5d72365 100644
--- a/spam.m4
+++ b/spam.m4
@@ -43,17 +43,21 @@ fetch_spam_limit:
 	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} \
-			       {spam_limit=$value} \
+			       {${if match{$value}{\N^-?[0-9]+$\N} \
+				     {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 \
@@ -61,7 +65,7 @@ fetch_spam_limit:
 					$local_part \
 					$local_part_suffix \
 					@$domain} \
-			    {${if match{$value}{\N^[0-9]+$\N} \
+			    {${if match{$value}{\N^-?[0-9]+$\N} \
 				  {spam_limit=$value} \
 				  {}}} \
 			    {}}} \