6 files changed, 30 insertions, 4 deletions

diff --git a/lib/output.c b/lib/output.c
index bfd43195..54d505d9 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -61,6 +61,8 @@ static inline char *fmt_subcheck_perfdata(mp_subcheck check) {
 mp_check mp_check_init(void) {
         mp_check check = {
                 .evaluation_function = &mp_eval_check_default,
+                .default_output_override = NULL,
+                .default_output_override_content = NULL,
         };
         return check;
 }
@@ -283,6 +285,11 @@ char *mp_fmt_output(mp_check check) {
 
         switch (output_format) {
         case MP_FORMAT_MULTI_LINE: {
+                if (check.default_output_override != NULL) {
+                        result = check.default_output_override(check.default_output_override_content);
+                        break;
+                }
+
                 if (check.summary == NULL) {
                         check.summary = get_subcheck_summary(check);
                 }
diff --git a/lib/output.h b/lib/output.h
index c63c8e3f..f5011268 100644
--- a/lib/output.h
+++ b/lib/output.h
@@ -70,6 +70,10 @@ struct mp_check {
 
         // the evaluation_functions computes the state of check
         mp_state_enum (*evaluation_function)(mp_check);
+
+        // override for the default output format
+        char *(*default_output_override)(void *);
+        void *default_output_override_content;
 };
 
 mp_check mp_check_init(void);
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a35f273e..2bea8fc0 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -166,7 +166,7 @@ check_real_LDADD = $(NETLIBS)
 check_snmp_SOURCES = check_snmp.c check_snmp.d/check_snmp_helpers.c
 check_snmp_LDADD = $(BASEOBJS)
 check_snmp_LDFLAGS = $(AM_LDFLAGS) -lm `net-snmp-config --libs`
-check_snmp_CFLAGS = $(AM_CFLAGS) `net-snmp-config --cflags`
+check_snmp_CFLAGS = $(AM_CFLAGS) `net-snmp-config --cflags | sed 's/-Werror=declaration-after-statement//'`
 check_smtp_LDADD = $(SSLOBJS)
 check_ssh_LDADD = $(NETLIBS)
 check_swap_SOURCES = check_swap.c check_swap.d/swap.c
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 7ffa0ded..4d0c8e7d 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -41,6 +41,8 @@ const char *email = "devel@monitoring-plugins.org";
 #       define NP_MAXARGS 1024
 #endif
 
+char *check_by_ssh_output_override(void *remote_output) { return ((char *)remote_output); }
+
 typedef struct {
         int errorcode;
         check_by_ssh_config config;
@@ -155,10 +157,21 @@ int main(int argc, char **argv) {
                 xasprintf(&sc_active_check.output, "command stdout:");
 
                 if (child_result.out.lines > skip_stdout) {
+
+                        char *remote_command_output = NULL;
                         for (size_t i = skip_stdout; i < child_result.out.lines; i++) {
-                                xasprintf(&sc_active_check.output, "%s\n%s", sc_active_check.output,
-                                                  child_result.out.line[i]);
+                                if (i == skip_stdout) {
+                                        // first iteration
+                                        xasprintf(&remote_command_output, "%s", child_result.out.line[i]);
+                                } else {
+                                        xasprintf(&remote_command_output, "%s\n%s", remote_command_output,
+                                                          child_result.out.line[i]);
+                                }
                         }
+
+                        sc_active_check.output = remote_command_output;
+                        overall.default_output_override_content = remote_command_output;
+                        overall.default_output_override = check_by_ssh_output_override;
                 } else {
                         xasprintf(&sc_active_check.output, "remote command '%s' returned status %d",
                                           config.remotecmd, child_result.cmd_error_code);
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index f470d222..1746fd79 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -116,6 +116,7 @@ gen_state_string_type gen_state_string(check_snmp_state_entry *entries, size_t n
                                 break;
                         case ASN_FLOAT:
                                 printf("Type FLOAT\n");
+                                break;
                         case ASN_DOUBLE:
                                 printf("Type DOUBLE\n");
                                 break;
@@ -217,6 +218,7 @@ recover_state_data_type recover_state_data(char *state_string, idx_t state_strin
                                 break;
                         case ASN_FLOAT:
                                 printf("Type FLOAT\n");
+                                break;
                         case ASN_DOUBLE:
                                 printf("Type DOUBLE\n");
                                 break;
diff --git a/plugins/common.h b/plugins/common.h
index ef888d08..b3053486 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -193,7 +193,7 @@ enum {
  */
 #include "../gl/gettext.h"
 #define _(String) gettext(String)
-#if !ENABLE_NLS
+#if !defined(ENABLE_NLS) || !ENABLE_NLS
 #       undef textdomain
 #       define textdomain(Domainname) /* empty */
 #       undef bindtextdomain