8 files changed, 96 insertions, 21 deletions

diff --git a/lib/output.c b/lib/output.c
index 54d505d9..3c04d63d 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -420,7 +420,7 @@ static inline char *fmt_subcheck_output(mp_output_format output_format, mp_subch
                         // add the rest (if any)
                         if (have_residual_chars) {
                                 char *tmp = check.output;
-                                xasprintf(&check.output, "%s\n%s%s", intermediate_string,
+                                xasprintf(&check.output, "%s%s%s", intermediate_string,
                                                   generate_indentation_string(indentation + 1), tmp);
                         } else {
                                 check.output = intermediate_string;
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index 67d89129..3f44c86b 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -273,9 +273,17 @@ mp_subcheck check_http(const check_curl_config config, check_curl_working_state
 
         /* Curl errors, result in critical Nagios state */
         if (res != CURLE_OK) {
-                xasprintf(&sc_curl.output, _("Error while performing connection: cURL returned %d - %s"),
-                                  res, errbuf[0] ? errbuf : curl_easy_strerror(res));
-                sc_curl = mp_set_subcheck_state(sc_curl, STATE_CRITICAL);
+                /* Custom handling for timeouts, state might be set to non CRITICAL */
+                if (res == CURLE_OPERATION_TIMEDOUT) {
+                        xasprintf(&sc_curl.output, _("cURL returned %d - %s"), res,
+                                          errbuf[0] ? errbuf : curl_easy_strerror(res));
+                        sc_curl = mp_set_subcheck_state(sc_curl, config.on_timeout_result_state);
+                } else {
+                        xasprintf(&sc_curl.output,
+                                          _("Error while performing connection: cURL returned %d - %s"), res,
+                                          errbuf[0] ? errbuf : curl_easy_strerror(res));
+                        sc_curl = mp_set_subcheck_state(sc_curl, STATE_CRITICAL);
+                }
                 mp_add_subcheck_to_subcheck(&sc_result, sc_curl);
                 return sc_result;
         }
@@ -890,6 +898,7 @@ check_curl_config_wrapper process_arguments(int argc, char **argv) {
                 STATE_REGEX,
                 OUTPUT_FORMAT,
                 NO_PROXY,
+                TIMEOUT_RESULT,
         };
 
         static struct option longopts[] = {
@@ -939,6 +948,7 @@ check_curl_config_wrapper process_arguments(int argc, char **argv) {
                 {"cookie-jar", required_argument, 0, COOKIE_JAR},
                 {"haproxy-protocol", no_argument, 0, HAPROXY_PROTOCOL},
                 {"output-format", required_argument, 0, OUTPUT_FORMAT},
+                {"timeout-result", required_argument, 0, TIMEOUT_RESULT},
                 {0, 0, 0, 0}};
 
         check_curl_config_wrapper result = {
@@ -1004,6 +1014,21 @@ check_curl_config_wrapper process_arguments(int argc, char **argv) {
                                 result.config.curl_config.socket_timeout = (int)strtol(optarg, NULL, 10);
                         }
                         break;
+                case TIMEOUT_RESULT:
+                        if (!strcmp(optarg, "0") || !strcasecmp(optarg, "ok")) {
+                                result.config.on_timeout_result_state = STATE_OK;
+                        } else if (!strcmp(optarg, "1") || !strcasecmp(optarg, "warning")) {
+                                result.config.on_timeout_result_state = STATE_WARNING;
+                        } else if (!strcmp(optarg, "2") || !strcasecmp(optarg, "critical")) {
+                                result.config.on_timeout_result_state = STATE_CRITICAL;
+                        } else if (!strcmp(optarg, "3") || !strcasecmp(optarg, "unknown")) {
+                                result.config.on_timeout_result_state = STATE_UNKNOWN;
+                        } else {
+                                usage2(_("Invalid timeout-result state option, give either a return code or state "
+                                                 "name in lowercase"),
+                                           optarg);
+                        }
+                        break;
                 case 'c': /* critical time threshold */
                 {
                         mp_range_parsed critical_range = mp_parse_range_string(optarg);
@@ -1701,6 +1726,10 @@ void print_help(void) {
 
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
+        printf(" %s\n", "--timeout-result=ok|warning|critical|unknown|0|1|2|3");
+        printf("    %s\n", _("Timeouts default to returning STATE_CRITICAL."));
+        printf("    %s\n", _("This argument changes the return state on timeouts."));
+
         printf(UT_VERBOSE);
 
         printf(UT_OUTPUT_FORMAT);
diff --git a/plugins/check_curl.d/check_curl_helpers.c b/plugins/check_curl.d/check_curl_helpers.c
index 80d6f4f6..5b13a138 100644
--- a/plugins/check_curl.d/check_curl_helpers.c
+++ b/plugins/check_curl.d/check_curl_helpers.c
@@ -755,6 +755,7 @@ check_curl_config check_curl_config_init(void) {
                 .header_expect = "",
                 .on_redirect_result_state = STATE_OK,
                 .on_redirect_dependent = false,
+                .on_timeout_result_state = STATE_CRITICAL,
 
                 .show_extended_perfdata = false,
                 .show_body = false,
diff --git a/plugins/check_curl.d/config.h b/plugins/check_curl.d/config.h
index bcdf3010..0a7fa01d 100644
--- a/plugins/check_curl.d/config.h
+++ b/plugins/check_curl.d/config.h
@@ -113,9 +113,12 @@ typedef struct {
         mp_state_enum on_redirect_result_state;
         bool on_redirect_dependent;
 
+        mp_state_enum on_timeout_result_state;
+
         bool show_extended_perfdata;
         bool show_body;
 
+
         bool output_format_is_set;
         mp_output_format output_format;
 } check_curl_config;
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 71f94b91..73e4f3b6 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -205,7 +205,8 @@ bool process_arguments(int argc, char **argv) {
                 SNI_OPTION,
                 MAX_REDIRS_OPTION,
                 CONTINUE_AFTER_CHECK_CERT,
-                STATE_REGEX
+                STATE_REGEX,
+                TIMEOUT_RESULT
         };
 
         int option = 0;
@@ -247,6 +248,7 @@ bool process_arguments(int argc, char **argv) {
                 {"extended-perfdata", no_argument, 0, 'E'},
                 {"show-body", no_argument, 0, 'B'},
                 {"max-redirs", required_argument, 0, MAX_REDIRS_OPTION},
+                {"timeout-result", required_argument, 0, TIMEOUT_RESULT},
                 {0, 0, 0, 0}};
 
         if (argc < 2) {
@@ -298,6 +300,21 @@ bool process_arguments(int argc, char **argv) {
                                 socket_timeout = atoi(optarg);
                         }
                         break;
+                case TIMEOUT_RESULT:
+                        if (!strcmp(optarg, "0") || !strcasecmp(optarg, "ok")) {
+                                socket_timeout_state = STATE_OK;
+                        } else if (!strcmp(optarg, "1") || !strcasecmp(optarg, "warning")) {
+                                socket_timeout_state = STATE_WARNING;
+                        } else if (!strcmp(optarg, "2") || !strcasecmp(optarg, "critical")) {
+                                socket_timeout_state = STATE_CRITICAL;
+                        } else if (!strcmp(optarg, "3") || !strcasecmp(optarg, "unknown")) {
+                                socket_timeout_state = STATE_UNKNOWN;
+                        } else {
+                                usage2(_("Invalid timeout-result state option, give either a return code or state "
+                                                 "name in lowercase"),
+                                           optarg);
+                        }
+                        break;
                 case 'c': /* critical time threshold */
                         critical_thresholds = optarg;
                         break;
@@ -1032,7 +1049,7 @@ int check_http(void) {
                         printf("SSL initialized\n");
                 }
                 if (result != STATE_OK) {
-                        die(STATE_CRITICAL,  _("HTTP CRITICAL - SSL error\n"));
+                        die(STATE_CRITICAL, _("HTTP CRITICAL - SSL error\n"));
                 }
                 microsec_ssl = deltime(tv_temp);
                 elapsed_time_ssl = (double)microsec_ssl / 1.0e6;
@@ -1883,6 +1900,10 @@ void print_help(void) {
 
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
+        printf(" %s\n", "--timeout-result=ok|warning|critical|unknown|0|1|2|3");
+        printf("    %s\n", _("Timeouts default to returning STATE_CRITICAL."));
+        printf("    %s\n", _("This argument changes the return state on timeouts."));
+
         printf(UT_VERBOSE);
 
         printf("\n");
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 60fa646f..7995408e 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -65,7 +65,7 @@ typedef struct {
         int errorcode;
         char **top_processes;
 } top_processes_result;
-static top_processes_result print_top_consuming_processes(unsigned long n_procs_to_show);
+static top_processes_result get_top_consuming_processes(unsigned long n_procs_to_show);
 
 typedef struct {
         mp_range load[3];
@@ -158,7 +158,7 @@ int main(int argc, char **argv) {
 
                 mp_subcheck scaled_load_sc = mp_subcheck_init();
                 scaled_load_sc = mp_set_subcheck_default_state(scaled_load_sc, STATE_OK);
-                scaled_load_sc.output = "Scaled Load (divided by number of CPUs";
+                scaled_load_sc.output = "Scaled Load (divided by number of CPUs)";
 
                 mp_perfdata pd_scaled_load1 = perfdata_init();
                 pd_scaled_load1.label = "scaled_load1";
@@ -248,12 +248,13 @@ int main(int argc, char **argv) {
         if (config.n_procs_to_show > 0) {
                 mp_subcheck top_proc_sc = mp_subcheck_init();
                 top_proc_sc = mp_set_subcheck_state(top_proc_sc, STATE_OK);
-                top_processes_result top_proc = print_top_consuming_processes(config.n_procs_to_show);
+                top_processes_result top_proc = get_top_consuming_processes(config.n_procs_to_show);
                 xasprintf(&top_proc_sc.output, "Top %lu CPU time consuming processes",
                                   config.n_procs_to_show);
 
                 if (top_proc.errorcode == OK) {
-                        for (unsigned long i = 0; i < config.n_procs_to_show; i++) {
+                        // +1 here since the string list contains the header line
+                        for (unsigned long i = 0; i < config.n_procs_to_show +1; i++) {
                                 xasprintf(&top_proc_sc.output, "%s\n%s", top_proc_sc.output,
                                                   top_proc.top_processes[i]);
                         }
@@ -286,11 +287,6 @@ static check_load_config_wrapper process_arguments(int argc, char **argv) {
                 .config = check_load_config_init(),
         };
 
-        if (argc < 2) {
-                result.errorcode = ERROR;
-                return result;
-        }
-
         while (true) {
                 int option = 0;
                 int option_index = getopt_long(argc, argv, "Vhrc:w:n:", longopts, &option);
@@ -448,7 +444,7 @@ int cmpstringp(const void *p1, const void *p2) {
 }
 #endif /* PS_USES_PROCPCPU */
 
-static top_processes_result print_top_consuming_processes(unsigned long n_procs_to_show) {
+static top_processes_result get_top_consuming_processes(unsigned long n_procs_to_show) {
         top_processes_result result = {
                 .errorcode = OK,
         };
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 0f62ce8b..09196dc4 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -1034,13 +1034,13 @@ void print_help(void) {
         printf("    %s\n", _("SNMPv3 context"));
         printf(" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]");
         printf("    %s\n", _("SNMPv3 securityLevel"));
-        printf(" %s\n", "-a, --authproto=[MD5|SHA]");
+        printf(" %s\n", "-a, --authproto=[MD5|SHA|SHA224|SHA256|SHA384|SHA512]");
         printf("    %s\n", _("SNMPv3 auth proto"));
 #ifdef HAVE_USM_DES_PRIV_PROTOCOL
-        printf(" %s\n", "-x, --privproto=[DES|AES]");
+        printf(" %s\n", "-x, --privproto=[DES|AES|AES192|AES256]");
         printf("    %s\n", _("SNMPv3 priv proto (default DES)"));
 #else
-        printf(" %s\n", "-x, --privproto=[AES]");
+        printf(" %s\n", "-x, --privproto=[AES|AES192|AES256]");
         printf("    %s\n", _("SNMPv3 priv proto (default AES)"));
 #endif
 
diff --git a/plugins/t/check_curl.t b/plugins/t/check_curl.t
index 0f4d0de7..7ec8ca06 100644
--- a/plugins/t/check_curl.t
+++ b/plugins/t/check_curl.t
@@ -13,7 +13,7 @@ use vars qw($tests $has_ipv6);
 BEGIN {
     use NPTest;
     $has_ipv6 = NPTest::has_ipv6();
-    $tests = $has_ipv6 ? 57 : 92;
+    $tests = $has_ipv6 ? 65 : 100;
     plan tests => $tests;
 }
 
@@ -69,7 +69,32 @@ $res = NPTest->testCmd(
     );
 cmp_ok( $res->return_code, '==', 2, "Webserver $host_nonresponsive not responding" );
 # was CRITICAL only, but both check_curl and check_http print HTTP CRITICAL (puzzle?!)
-like( $res->output, "/cURL returned 28 - Connection timed out after/", "Output OK");
+like( $res->output, "/cURL returned 28 - (Connection|Operation) timed out after/", "Output OK");
+
+# timeout return results can be changed using --timeout-result option
+$res = NPTest->testCmd(
+    "./$plugin $host_nonresponsive -wt 1 -ct 2 -t 3 --timeout-result ok"
+    );
+like( $res->output, "/cURL returned 28 - (Connection|Operation) timed out after/", "Output OK");
+cmp_ok( $res->return_code, "==", 0, "Return code is correct due argument: --timeout-result ok");
+
+$res = NPTest->testCmd(
+    "./$plugin $host_nonresponsive -wt 1 -ct 2 -t 3 --timeout-result warning"
+    );
+like( $res->output, "/cURL returned 28 - (Connection|Operation) timed out after/", "Output OK");
+cmp_ok( $res->return_code, "==", 1, "Return code is correct due argument: --timeout-result warning");
+
+$res = NPTest->testCmd(
+    "./$plugin $host_nonresponsive -wt 1 -ct 2 -t 3 --timeout-result 2"
+    );
+like( $res->output, "/cURL returned 28 - (Connection|Operation) timed out after/", "Output OK");
+cmp_ok( $res->return_code, "==", 2, "Return code is correct due argument: --timeout-result 2");
+
+$res = NPTest->testCmd(
+    "./$plugin $host_nonresponsive -wt 1 -ct 2 -t 3 --timeout-result 3"
+    );
+like( $res->output, "/cURL returned 28 - (Connection|Operation) timed out after/", "Output OK");
+cmp_ok( $res->return_code, "==", 3, "Return code is correct due argument: --timeout-result 3");
 
 $res = NPTest->testCmd(
     "./$plugin $hostname_invalid -wt 1 -ct 2"