Fixes #310

CHANGELOG

 CHANGELOG
 ---------
 
+2021-04-08
+  sympl-mail
+    * Fix tag option not working correctly for antispam and antivirus configs
+
 2020-09-23
   sympl-core
     * Properly filter public/cgi-bin

mail/debian/changelog

+sympl-mail (9.20210408.0) stable; urgency=medium
+
+  * Fixed readable check for antispam and antivirus configs
+
+ -- Paul Cammish <sympl@kelduum.net>  Thu, 08 Apr 2021 15:18:19 +0100
+  
 sympl-mail (9.0.200418.0) stable; urgency=medium
 
   * Fixed sympl-mail-dovecot-sni issue with filesystem loops (#281)

mail/exim4/sympl.d/10-acl/50-acl-check-rcpt/80-enable-antispam-check

@@ -19,11 +19,11 @@
                          }}\
                        }
 
-          # Reuse acl_m0 since we don't need it any more.  If it contains tag,
-          # then the message will be accepted, and tagged, else we reject the
-          # mail.
+          # Reuse acl_m0 since we don't need it any more.  If it is readable and
+          # starts with 'tag', then the message will be accepted and tagged, else
+          # we reject the mail.
 
-          set acl_m0  = ${if match{${extract{smode}{${stat:VHOST_DIR/${domain}/VHOST_CONFIG_DIR/antispam}}}}{\Nr..$\N}{\
+          set acl_m0  = ${if match{${extract{smode}{${stat:VHOST_DIR/${domain}/VHOST_CONFIG_DIR/antispam}}}}{\Nr\N}{\
                           ${if match{${readfile{VHOST_DIR/${domain}/VHOST_CONFIG_DIR/antispam}}}{^tag}{tag}{reject}}\
                         }{reject}}
 

mail/exim4/sympl.d/10-acl/50-acl-check-rcpt/85-enable-antivirus-check

@@ -5,7 +5,7 @@
                          {!eq{$acl_m2}{tag}} \
                        }}
 
-          set acl_m2 = ${if match{${extract{smode}{${stat:VHOST_DIR/${domain}/VHOST_CONFIG_DIR/antivirus}}}}{\Nr..$\N}{\
+          set acl_m2 = ${if match{${extract{smode}{${stat:VHOST_DIR/${domain}/VHOST_CONFIG_DIR/antivirus}}}}{\Nr\N}{\
                           ${if match{${readfile{VHOST_DIR/${domain}/VHOST_CONFIG_DIR/antivirus}}}{^tag}{tag}{reject}}\
                        }{reject}}