From 85fb39af13a9bffaefdbcde33618f358b05fa4dc Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 29 May 2020 09:34:41 +0200
Subject: [PATCH] Adapt regex to match queued emails when spam filtering is
 disabled

---
 root/var/lib/zabbix/bin/util_parse_mail_in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/root/var/lib/zabbix/bin/util_parse_mail_in b/root/var/lib/zabbix/bin/util_parse_mail_in
index 0e1bc52..598d366 100644
--- a/root/var/lib/zabbix/bin/util_parse_mail_in
+++ b/root/var/lib/zabbix/bin/util_parse_mail_in
@@ -87,8 +87,8 @@ while (<STDIN>) {
         next;
     }
 
-    # Queued, not tagged as spam, those are the clean emails
-    elsif ($line =~ m/queued\s+<.*>\s+No,\s+(score|hits)=/){
+    # Queued, not tagged as spam (or spam filtering disabled), those are the clean emails
+    elsif ($line =~ m/queued\s+<.*>(\s+No,\s+(score|hits)=.+)?/){
         $cnt{queued}++;
         next;
     }