summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRincewindsHat <12514511+RincewindsHat@users.noreply.github.com>2021-11-17 18:09:25 +0100
committerGitHub <noreply@github.com>2021-11-17 18:09:25 +0100
commit4549a9524349c4384c0a7a2ca8662a418fc8fbe5 (patch)
tree5dc46e43ff07bb450e3d0e6b58a638866890803d
parentad45727dbe03fae94ed2a7ac26ca828fe0fa6264 (diff)
parent9076ea36f70dbd643de4102a88dbd2f18847af16 (diff)
downloadmonitoring-plugins-4549a95.tar.gz
Merge pull request #1654 from wolfgangkarall/master
check_procs -- exchange needle and haystack in strstr() for proper st…
-rw-r--r--plugins/check_procs.c2
-rwxr-xr-xplugins/tests/check_procs.t2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index bae429de..48723404 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -265,7 +265,7 @@ main (int argc, char **argv)
265 } 265 }
266 } 266 }
267 267
268 if ((options & STAT) && (strstr (statopts, procstat))) 268 if ((options & STAT) && (strstr (procstat, statopts)))
269 resultsum |= STAT; 269 resultsum |= STAT;
270 if ((options & ARGS) && procargs && (strstr (procargs, args) != NULL)) 270 if ((options & ARGS) && procargs && (strstr (procargs, args) != NULL))
271 resultsum |= ARGS; 271 resultsum |= ARGS;
diff --git a/plugins/tests/check_procs.t b/plugins/tests/check_procs.t
index fcea404e..3af218f5 100755
--- a/plugins/tests/check_procs.t
+++ b/plugins/tests/check_procs.t
@@ -96,7 +96,7 @@ is( $result->output, 'PROCS OK: 3 processes with RSS >= 100000 | procs=3;;;0;',
96 96
97$result = NPTest->testCmd( "$command -s S" ); 97$result = NPTest->testCmd( "$command -s S" );
98is( $result->return_code, 0, "Checking filter for sleeping processes" ); 98is( $result->return_code, 0, "Checking filter for sleeping processes" );
99like( $result->output, '/^PROCS OK: 44 processes with STATE = S/', "Output correct" ); 99like( $result->output, '/^PROCS OK: 88 processes with STATE = S/', "Output correct" );
100 100
101$result = NPTest->testCmd( "$command -s Z" ); 101$result = NPTest->testCmd( "$command -s Z" );
102is( $result->return_code, 0, "Checking filter for zombies" ); 102is( $result->return_code, 0, "Checking filter for zombies" );