summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/check_curl.c2
-rw-r--r--plugins/check_procs.c2
-rw-r--r--plugins/t/check_curl.t2
-rwxr-xr-xplugins/tests/check_procs.t2
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index 5990b95..14cc846 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -1422,7 +1422,7 @@ process_arguments (int argc, char **argv)
1422#ifdef LIBCURL_FEATURE_SSL 1422#ifdef LIBCURL_FEATURE_SSL
1423 case 'D': /* verify peer certificate & host */ 1423 case 'D': /* verify peer certificate & host */
1424 verify_peer_and_host = TRUE; 1424 verify_peer_and_host = TRUE;
1425 goto enable_ssl; 1425 break;
1426#endif 1426#endif
1427 case 'S': /* use SSL */ 1427 case 'S': /* use SSL */
1428#ifdef LIBCURL_FEATURE_SSL 1428#ifdef LIBCURL_FEATURE_SSL
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index bae429d..4872340 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/t/check_curl.t b/plugins/t/check_curl.t
index 45ee533..ada6a04 100644
--- a/plugins/t/check_curl.t
+++ b/plugins/t/check_curl.t
@@ -95,7 +95,7 @@ SKIP: {
95 $res = NPTest->testCmd("./$plugin -v -H $host_tls_http:443 -S -p 443"); 95 $res = NPTest->testCmd("./$plugin -v -H $host_tls_http:443 -S -p 443");
96 like( $res->output, '/^Host: '.$host_tls_http.'\s*$/ms', "Host Header OK" ); 96 like( $res->output, '/^Host: '.$host_tls_http.'\s*$/ms', "Host Header OK" );
97 97
98 $res = NPTest->testCmd("./$plugin -v -H $host_tls_http -D -p 443"); 98 $res = NPTest->testCmd("./$plugin -v -H $host_tls_http -D -S -p 443");
99 like( $res->output, '/(^Host: '.$host_tls_http.'\s*$)|(cURL returned 60)/ms', "Host Header OK" ); 99 like( $res->output, '/(^Host: '.$host_tls_http.'\s*$)|(cURL returned 60)/ms', "Host Header OK" );
100}; 100};
101 101
diff --git a/plugins/tests/check_procs.t b/plugins/tests/check_procs.t
index fcea404..3af218f 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" );