From 269bc80ec32526cf09903be8edd5ab97d9fe00c3 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sun, 31 May 2015 09:37:36 -0700 Subject: [PATCH] Postfix mail queue function can call error https://github.com/webmin/webmin/issues/218 --- status/mailq-monitor.pl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/status/mailq-monitor.pl b/status/mailq-monitor.pl index e7a5c6032..610f4de96 100755 --- a/status/mailq-monitor.pl +++ b/status/mailq-monitor.pl @@ -15,7 +15,14 @@ elsif ($m eq "qmailadmin") { } elsif ($m eq "postfix") { &foreign_require("postfix", "postfix-lib.pl"); - @qfiles = &postfix::list_queue(); + eval { + local $main::error_must_die = 1; + @qfiles = &postfix::list_queue(); + }; + if ($@) { + return { 'up' => -1, + 'desc' => $@ }; + } } if (@qfiles > $_[0]->{'size'}) { return { 'up' => 0,