Rebase to master (#1731)

1 files changed, 9 insertions, 7 deletions

diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
index 3914f4a7..8cc3d0f6 100755
--- a/plugins-scripts/check_mailq.pl
+++ b/plugins-scripts/check_mailq.pl
@@ -567,12 +567,14 @@ exit $state;
 
 sub process_arguments(){
         GetOptions
-                ("V"   => \$opt_V, "version"    => \$opt_V,
-                 "v"   => \$opt_v, "verbose"    => \$opt_v,
-                 "h"   => \$opt_h, "help"               => \$opt_h,
+                ("V"   => \$opt_V, "version"    => \$opt_V,
+                 "v"   => \$opt_v, "verbose"    => \$opt_v,
+                 "h"   => \$opt_h, "help"       => \$opt_h,
                  "M:s" => \$opt_M, "mailserver:s" => \$opt_M, # mailserver (default     sendmail)
                  "w=i" => \$opt_w, "warning=i"  => \$opt_w,   # warning if above this number
-                 "c=i" => \$opt_c, "critical=i" => \$opt_c,       # critical if above this number
+                 "c=i" => \$opt_c, "critical=i" => \$opt_c,   # critical if above this number
+                 "W=i" => \$opt_W, "warning-domain=i"  => \$opt_W,   # Warning if above this number
+                 "C=i" => \$opt_C, "critical-domain=i" => \$opt_C,   # Critical if above this number
                  "t=i" => \$opt_t, "timeout=i"  => \$opt_t,
                  "s"   => \$opt_s, "sudo"       => \$opt_s,
                  "d:s" => \$opt_d, "configdir:s" => \$opt_d,
@@ -671,15 +673,15 @@ sub print_help () {
         print "   Feedback/patches to support non-sendmail mailqueue welcome\n\n";
         print "-w (--warning)   = Min. number of messages in queue to generate warning\n";
         print "-c (--critical)  = Min. number of messages in queue to generate critical alert ( w < c )\n";
-        print "-W               = Min. number of messages for same domain in queue to generate warning\n";
-        print "-C               = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
+        print "-W (--warning-domain)  = Min. number of messages for same domain in queue to generate warning\n";
+        print "-C (--critical-domain) = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
         print "-t (--timeout)   = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";
         print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer ] (default = autodetect)\n";
         print "-s (--sudo)      = Use sudo to call the mailq command\n";
         print "-d (--configdir) = Config file or directory\n";
         print "-h (--help)\n";
         print "-V (--version)\n";
-        print "-v (--verbose)   = debugging output\n";
+        print "-v (--verbose)         = debugging output\n";
         print "\n\n";
         print "Note: -w and -c are required arguments.  -W and -C are optional.\n";
         print " -W and -C are applied to domains listed on the queues - both FROM and TO. (sendmail)\n";