Fixed --mismatch option for check_tcp. Added tests into check_imap

(Rick Fey - 1339134)

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1273 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/THANKS.in b/THANKS.in
index fb73b141858a1d56e56e30ad9cb0fe4630217781..66e728c44c37d4bb687049c42681710160e85fe7 100644 (file)
--- a/THANKS.in
+++ b/THANKS.in
@@ -169,3 +169,5 @@ Chester Hosey
 Pascal Larisch
 David Sullivan
 Bob Ingraham
+Hans Engelen
+Rick Frey

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index cb7a869d071d35d011852865e155066e13a4d4c1..08ec85650042d9fc470308a9ed69b27ab5e7f53b 100644 (file)
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -311,7 +311,7 @@ main (int argc, char **argv)
 
        /* did we get the response we hoped? */
        if(match == -2 && result != STATE_CRITICAL)
-               result = STATE_WARNING;
+               result = expect_mismatch_state;
 
        /* reset the alarm */
        alarm (0);

diff --git a/plugins/t/check_imap.t b/plugins/t/check_imap.t
index f86faa4c2392cd22217ff538b35137d8ece921ce..32b4136a28d2dce80e177a059457700ea02ffca3 100644 (file)
--- a/plugins/t/check_imap.t
+++ b/plugins/t/check_imap.t
@@ -10,7 +10,7 @@ use Test;
 use NPTest;
 
 use vars qw($tests);
-BEGIN {$tests = 5; plan tests => $tests}
+BEGIN {$tests = 7; plan tests => $tests}
 
 my $host_tcp_smtp      = getTestParameter( "host_tcp_smtp",      "NP_HOST_TCP_SMTP",      "mailhost",
                                           "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 '*
 $t += checkCmd( "./check_imap    $host_tcp_imap -p 143 -wt 9 -ct 9 -to 10 -e '* OK'", 0, undef, %exceptions );
 $t += checkCmd( "./check_imap    $host_nonresponsive", 2 );
 $t += checkCmd( "./check_imap    $hostname_invalid",   2 );
+$t += checkCmd( "./check_imap -H $host_tcp_imap -e unlikely_string",                  1);
+$t += checkCmd( "./check_imap -H $host_tcp_imap -e unlikely_string -M crit",          2);
 
 
 exit(0) if defined($Test::Harness::VERSION);