summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--THANKS.in2
-rw-r--r--plugins/check_tcp.c2
-rw-r--r--plugins/t/check_imap.t4
3 files changed, 6 insertions, 2 deletions
diff --git a/THANKS.in b/THANKS.in
index fb73b14..66e728c 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -169,3 +169,5 @@ Chester Hosey
169Pascal Larisch 169Pascal Larisch
170David Sullivan 170David Sullivan
171Bob Ingraham 171Bob Ingraham
172Hans Engelen
173Rick Frey
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index cb7a869..08ec856 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -311,7 +311,7 @@ main (int argc, char **argv)
311 311
312 /* did we get the response we hoped? */ 312 /* did we get the response we hoped? */
313 if(match == -2 && result != STATE_CRITICAL) 313 if(match == -2 && result != STATE_CRITICAL)
314 result = STATE_WARNING; 314 result = expect_mismatch_state;
315 315
316 /* reset the alarm */ 316 /* reset the alarm */
317 alarm (0); 317 alarm (0);
diff --git a/plugins/t/check_imap.t b/plugins/t/check_imap.t
index f86faa4..32b4136 100644
--- a/plugins/t/check_imap.t
+++ b/plugins/t/check_imap.t
@@ -10,7 +10,7 @@ use Test;
10use NPTest; 10use NPTest;
11 11
12use vars qw($tests); 12use vars qw($tests);
13BEGIN {$tests = 5; plan tests => $tests} 13BEGIN {$tests = 7; plan tests => $tests}
14 14
15my $host_tcp_smtp = getTestParameter( "host_tcp_smtp", "NP_HOST_TCP_SMTP", "mailhost", 15my $host_tcp_smtp = getTestParameter( "host_tcp_smtp", "NP_HOST_TCP_SMTP", "mailhost",
16 "A host providing an STMP Service (a mail server)"); 16 "A host providing an STMP Service (a mail server)");
@@ -33,6 +33,8 @@ $t += checkCmd( "./check_imap -H $host_tcp_imap -p 143 -w 9 -c 9 -t 10 -e '*
33$t += checkCmd( "./check_imap $host_tcp_imap -p 143 -wt 9 -ct 9 -to 10 -e '* OK'", 0, undef, %exceptions ); 33$t += checkCmd( "./check_imap $host_tcp_imap -p 143 -wt 9 -ct 9 -to 10 -e '* OK'", 0, undef, %exceptions );
34$t += checkCmd( "./check_imap $host_nonresponsive", 2 ); 34$t += checkCmd( "./check_imap $host_nonresponsive", 2 );
35$t += checkCmd( "./check_imap $hostname_invalid", 2 ); 35$t += checkCmd( "./check_imap $hostname_invalid", 2 );
36$t += checkCmd( "./check_imap -H $host_tcp_imap -e unlikely_string", 1);
37$t += checkCmd( "./check_imap -H $host_tcp_imap -e unlikely_string -M crit", 2);
36 38
37 39
38exit(0) if defined($Test::Harness::VERSION); 40exit(0) if defined($Test::Harness::VERSION);