From cf44d7bd5761e17e487178952b9d0b897bfdbcba Mon Sep 17 00:00:00 2001 From: Eric van Gyzen Date: Sun, 11 Nov 2018 00:39:20 +0000 Subject: [PATCH] Fix daily mailq script for Postfix and daily_show_success="NO" Exit with a zero status when Postfix reports "Mail queue is empty" so this section won't appear in the report at all when daily_show_success="NO". MFC after: 2 weeks Sponsored by: Dell EMC Isilon --- usr.sbin/periodic/etc/daily/440.status-mailq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/periodic/etc/daily/440.status-mailq b/usr.sbin/periodic/etc/daily/440.status-mailq index d17fe4edf9c2..515f9f42ead9 100755 --- a/usr.sbin/periodic/etc/daily/440.status-mailq +++ b/usr.sbin/periodic/etc/daily/440.status-mailq @@ -33,7 +33,7 @@ case "$daily_status_mailq_enable" in *) mailq;; esac | tee /dev/stderr | - egrep -v '(mqueue is empty|Total requests)' | wc -l) + egrep -v '((Mail |m)queue is empty|Total requests)' | wc -l) [ $rc -gt 0 ] && rc=1 || rc=0 case "$daily_status_include_submit_mailq" in