2 files changed, 42 insertions, 12 deletions

diff --git a/lib/output.c b/lib/output.c
index d1a8d3b9..bfd43195 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -259,6 +259,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
@@ -299,6 +314,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);
                 }
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index 4a1fb647..f63cdea2 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -239,10 +239,35 @@ mp_subcheck check_http(const check_curl_config config, check_curl_working_state
         // ==============
         CURLcode res = curl_easy_perform(curl_state.curl);
 
+        if (verbose > 1) {
+                printf("* curl_easy_perform returned: %s\n", curl_easy_strerror(res));
+        }
+
         if (verbose >= 2 && workingState.http_post_data) {
                 printf("**** REQUEST CONTENT ****\n%s\n", workingState.http_post_data);
         }
 
+         // curl_state is updated after curl_easy_perform, and with updated curl_state certificate checks can be done
+         // Check_http tries to check certs as early as possible, and exits with certificate check result by default. Behave similarly.
+#ifdef LIBCURL_FEATURE_SSL
+        if (workingState.use_ssl && config.check_cert) {
+                if (verbose > 1) {
+                        printf("* adding a subcheck for the certificate\n");
+                }
+                mp_subcheck sc_certificate = check_curl_certificate_checks(
+                        curl_state.curl, cert, config.days_till_exp_warn, config.days_till_exp_crit);
+
+                mp_add_subcheck_to_subcheck(&sc_result, sc_certificate);
+                if (!config.continue_after_check_cert) {
+                        if (verbose > 1) {
+                                printf("* returning after adding the subcheck for certificate, continuing after "
+                                           "checking the certificate is turned off\n");
+                        }
+                        return sc_result;
+                }
+        }
+#endif
+
         mp_subcheck sc_curl = mp_subcheck_init();
 
         /* Curl errors, result in critical Nagios state */
@@ -283,18 +308,6 @@ mp_subcheck check_http(const check_curl_config config, check_curl_working_state
         // Evaluation
         // ==========
 
-#ifdef LIBCURL_FEATURE_SSL
-        if (workingState.use_ssl && config.check_cert) {
-                mp_subcheck sc_certificate = check_curl_certificate_checks(
-                        curl_state.curl, cert, config.days_till_exp_warn, config.days_till_exp_crit);
-
-                mp_add_subcheck_to_subcheck(&sc_result, sc_certificate);
-                if (!config.continue_after_check_cert) {
-                        return sc_result;
-                }
-        }
-#endif
-
         /* we got the data and we executed the request in a given time, so we can append
          * performance data to the answer always
          */