diff options
| author |  RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
| 2021-11-17 18:09:25 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-11-17 18:09:25 +0100 |
| commit | 4549a9524349c4384c0a7a2ca8662a418fc8fbe5 (patch) | |
| tree | 5dc46e43ff07bb450e3d0e6b58a638866890803d | |
| parent | ad45727dbe03fae94ed2a7ac26ca828fe0fa6264 (diff) | |
| parent | 9076ea36f70dbd643de4102a88dbd2f18847af16 (diff) | |
| download | monitoring-plugins-4549a9524349c4384c0a7a2ca8662a418fc8fbe5.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.c | 2 | ||||
| -rwxr-xr-x | plugins/tests/check_procs.t | 2 |
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) } } - if ((options & STAT) && (strstr (statopts, procstat))) + if ((options & STAT) && (strstr (procstat, statopts))) resultsum |= STAT; if ((options & ARGS) && procargs && (strstr (procargs, args) != NULL)) 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;', $result = NPTest->testCmd( "$command -s S" ); is( $result->return_code, 0, "Checking filter for sleeping processes" ); -like( $result->output, '/^PROCS OK: 44 processes with STATE = S/', "Output correct" ); +like( $result->output, '/^PROCS OK: 88 processes with STATE = S/', "Output correct" ); $result = NPTest->testCmd( "$command -s Z" ); is( $result->return_code, 0, "Checking filter for zombies" ); |