svn commit: r341092 - stable/12/usr.sbin/periodic/etc/daily

[Eric van Gyzen]

Author: vangyzen
Date: Tue Nov 27 19:45:24 2018
New Revision: 341092
URL: https://svnweb.freebsd.org/changeset/base/341092

Log:
  MFC r340345
  
  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".
  
  Sponsored by:	Dell EMC Isilon

Modified:
  stable/12/usr.sbin/periodic/etc/daily/440.status-mailq
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/periodic/etc/daily/440.status-mailq
==============================================================================
--- stable/12/usr.sbin/periodic/etc/daily/440.status-mailq	Tue Nov 27 19:44:39 2018	(r341091)
+++ stable/12/usr.sbin/periodic/etc/daily/440.status-mailq	Tue Nov 27 19:45:24 2018	(r341092)
@@ -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