Explorar el Código

check_mailq Nullmailer Regex is not working for Ubuntu 16.04

Fix for issue #237
John C. Frickson hace 9 años
padre
commit
4b1bc908d7
Se han modificado 2 ficheros con 2 adiciones y 1 borrados
  1. 1 0
      NEWS
  2. 1 1
      plugins-scripts/check_mailq.pl

+ 1 - 0
NEWS

@@ -15,6 +15,7 @@ x.x.x xxxx-xx-xx
 	check_ntp_peer: requires newline when there is a socket timeout (fix in netutils.c)
 	check_ntp_peer: requires newline when there is a socket timeout (fix in netutils.c)
 	check_users: segmentation fault if both thresholds are not provided
 	check_users: segmentation fault if both thresholds are not provided
 	check_dns: DNS CRITICAL - expected ‘{hostname}.’ but got 'name = {hostname}.'
 	check_dns: DNS CRITICAL - expected ‘{hostname}.’ but got 'name = {hostname}.'
+	check_mailq: Nullmailer Regex is not working for Ubuntu 16.04
 
 
 
 
 2.2.0 2017-01-19
 2.2.0 2017-01-19

+ 1 - 1
plugins-scripts/check_mailq.pl

@@ -541,7 +541,7 @@ elsif ( $mailq eq "nullmailer" ) {
 	while (<MAILQ>) {
 	while (<MAILQ>) {
 	    #2006-06-22 16:00:00  282 bytes
 	    #2006-06-22 16:00:00  282 bytes
 
 
-	    if (/^[1-9][0-9]*-[01][0-9]-[0-3][0-9]\s[0-2][0-9]\:[0-2][0-9]\:[0-2][0-9]\s{2}[0-9]+\sbytes$/) {
+	    if (/^[1-9][0-9]*-[01][0-9]-[0-3][0-9]\s[0-2][0-9]\:[0-2][0-9]\:[0-2][0-9]\s{1,2}[0-9]+\sbytes$/) {
 		$msg_q++ ;
 		$msg_q++ ;
 	    }
 	    }
 	}
 	}