1 files changed, 27 insertions, 3 deletions

diff --git a/lib/output.c b/lib/output.c
index 62e1366d..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;
 }
@@ -165,7 +167,7 @@ int mp_add_subcheck_to_subcheck(mp_subcheck check[static 1], mp_subcheck subchec
 void mp_add_summary(mp_check check[static 1], char *summary) { check->summary = summary; }
 
 /*
- * Generate the summary string of a mp_check object based on it's subchecks
+ * Generate the summary string of a mp_check object based on its subchecks
  */
 char *get_subcheck_summary(mp_check check) {
         mp_subcheck_list *subchecks = check.subchecks;
@@ -175,7 +177,7 @@ char *get_subcheck_summary(mp_check check) {
         unsigned int critical = 0;
         unsigned int unknown = 0;
         while (subchecks != NULL) {
-                switch (subchecks->subcheck.state) {
+                switch (mp_compute_subcheck_state(subchecks->subcheck)) {
                 case STATE_OK:
                         ok++;
                         break;
@@ -243,7 +245,7 @@ mp_state_enum mp_compute_check_state(const mp_check check) {
 }
 
 /*
- * Generate the result state of a mp_check object based on it's own state and it's subchecks states
+ * Generate the result state of a mp_check object based on its own state and its subchecks states
  */
 mp_state_enum mp_eval_check_default(const mp_check check) {
         assert(check.subchecks != NULL); // a mp_check without subchecks is invalid, die here
@@ -259,6 +261,21 @@ mp_state_enum mp_eval_check_default(const mp_check check) {
         return result;
 }
 
+// Remove troublesome symbols from plugin output
+char *sanitize_output_insitu(char *input) {
+        if (input == NULL) {
+                return input;
+        }
+
+        for (char *walker = input; *walker != '\0'; walker++) {
+                if (*walker == '|') {
+                        *walker = ' ';
+                }
+        }
+
+        return input;
+}
+
 /*
  * Generate output string for a mp_check object
  * Non static to be available for testing functions
@@ -268,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);
                 }
@@ -299,6 +321,8 @@ char *mp_fmt_output(mp_check check) {
                         subchecks = subchecks->next;
                 }
 
+                result = sanitize_output_insitu(result);
+
                 if (pd_string != NULL && strlen(pd_string) > 0) {
                         asprintf(&result, "%s|%s", result, pd_string);
                 }