Merge pull request #172 from stephdl/Fix5940

Same symbol for domain|sub.domain WL|BL NethServer/dev#5940
NethServer · Dec 6, 2019 · c52bee8 · c52bee8
2 parents e23a329 + d19020f
commit c52bee8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/filter/etc/e-smith/templates/etc/rspamd/local.d/multimap.conf/10base b/filter/etc/e-smith/templates/etc/rspamd/local.d/multimap.conf/10base
@@ -39,7 +39,7 @@ FROM_SUBDOMAINS_WHITELIST {
     action = "accept";
     filter = "email:domain";
     description = "Accept SMTP sender by exact domain name";
-    symbol = "FROM_SUBDOMAINS_WHITELIST";
+    symbol = "FROM_DOMAINS_WHITELIST";
 }
 
 #whitelist the domains of senders
@@ -75,7 +75,7 @@ FROM_SUBDOMAINS_BLACKLIST {
     type = "from";
     filter = "email:domain";
     description = "Reject SMTP sender by exact domain name";
-    symbol = "FROM_SUBDOMAINS_BLACKLIST";
+    symbol = "FROM_DOMAINS_BLACKLIST";
 }
 
 #blacklist the domains of senders
@@ -99,7 +99,7 @@ TO_SUBDOMAINS_WHITELIST {
     action = "accept";
     filter = "email:domain";
     description = "Accept SMTP recipient by exact domain name";
-    symbol = "TO_SUBDOMAINS_WHITELIST";
+    symbol = "TO_DOMAINS_WHITELIST";
 }
 
 #whitelist the domain of recipients

diff --git a/filter/etc/rspamd/local.d/force_actions.conf b/filter/etc/rspamd/local.d/force_actions.conf
@@ -12,6 +12,6 @@ rules {
     REJECT_FROM_BLACKLIST {
         action = "reject";
         message = "Sender email address rejected";
-        expression = "FROM_BLACKLIST | FROM_SUBDOMAINS_BLACKLIST | FROM_DOMAINS_BLACKLIST";
+        expression = "FROM_BLACKLIST | FROM_DOMAINS_BLACKLIST";
     }
 }