Deleted: trunk/patches/nagios_bugfix_2627
===================================================================
--- trunk/patches/nagios_bugfix_2627 2013-02-26 20:18:31 UTC (rev 222)
+++ trunk/patches/nagios_bugfix_2627 2013-02-26 20:33:13 UTC (rev 223)
@@ -1,13 +0,0 @@
-diff -ur nagios-4.0.20130107.original//lib/runcmd.c nagios-4.0.20130107/lib/runcmd.c
---- nagios-4.0.20130107.original//lib/runcmd.c 2012-12-24 15:29:25.000000000 +0000
-+++ nagios-4.0.20130107/lib/runcmd.c 2013-02-26 19:44:51.000000000 +0000
-@@ -151,7 +151,8 @@
- break;
-
- case '\\':
-- i++;
-+ if(!have_state(STATE_INSQ))
-+ i++;
- break;
-
- case '\'':
Copied: trunk/patches/nagios_bugfix_2627.patch (from rev 222, trunk/patches/nagios_bugfix_2627)
===================================================================
--- trunk/patches/nagios_bugfix_2627.patch (rev 0)
+++ trunk/patches/nagios_bugfix_2627.patch 2013-02-26 20:33:13 UTC (rev 223)
@@ -0,0 +1,13 @@
+diff -ur nagios-4.0.20130107.original//lib/runcmd.c nagios-4.0.20130107/lib/runcmd.c
+--- nagios-4.0.20130107.original//lib/runcmd.c 2012-12-24 15:29:25.000000000 +0000
++++ nagios-4.0.20130107/lib/runcmd.c 2013-02-26 19:44:51.000000000 +0000
+@@ -151,7 +151,8 @@
+ break;
+
+ case '\\':
+- i++;
++ if(!have_state(STATE_INSQ))
++ i++;
+ break;
+
+ case '\'':
Deleted: trunk/patches/nagios_bugfix_2628
===================================================================
--- trunk/patches/nagios_bugfix_2628 2013-02-26 20:18:31 UTC (rev 222)
+++ trunk/patches/nagios_bugfix_2628 2013-02-26 20:33:13 UTC (rev 223)
@@ -1,30 +0,0 @@
-diff -ur nagios-4.0.20130107.original//base/checks.c nagios-4.0.20130107/base/checks.c
---- nagios-4.0.20130107.original//base/checks.c 2013-02-26 17:10:48.000000000 +0000
-+++ nagios-4.0.20130107/base/checks.c 2013-02-26 19:59:15.000000000 +0000
-@@ -464,7 +464,7 @@
- else {
-
- /* parse check output to get: (1) short output, (2) long output, (3) perf data */
-- parse_check_output(queued_check_result->output, &temp_service->plugin_output, &temp_service->long_plugin_output, &temp_service->perf_data, TRUE, TRUE);
-+ parse_check_output(queued_check_result->output, &temp_service->plugin_output, &temp_service->long_plugin_output, &temp_service->perf_data, TRUE, FALSE);
-
- /* make sure the plugin output isn't null */
- if(temp_service->plugin_output == NULL)
-@@ -2212,7 +2212,7 @@
- hst->check_type = CHECK_TYPE_ACTIVE;
-
- /* parse the output: short and long output, and perf data */
-- parse_check_output(temp_plugin_output, &hst->plugin_output, &hst->long_plugin_output, &hst->perf_data, TRUE, TRUE);
-+ parse_check_output(temp_plugin_output, &hst->plugin_output, &hst->long_plugin_output, &hst->perf_data, TRUE, FALSE);
-
- /* free memory */
- my_free(temp_plugin_output);
-@@ -2609,7 +2609,7 @@
- my_free(temp_host->perf_data);
-
- /* parse check output to get: (1) short output, (2) long output, (3) perf data */
-- parse_check_output(queued_check_result->output, &temp_host->plugin_output, &temp_host->long_plugin_output, &temp_host->perf_data, TRUE, TRUE);
-+ parse_check_output(queued_check_result->output, &temp_host->plugin_output, &temp_host->long_plugin_output, &temp_host->perf_data, TRUE, FALSE);
-
- /* make sure we have some data */
- if(temp_host->plugin_output == NULL || !strcmp(temp_host->plugin_output, "")) {
Copied: trunk/patches/nagios_bugfix_2628.patch (from rev 222, trunk/patches/nagios_bugfix_2628)
===================================================================
--- trunk/patches/nagios_bugfix_2628.patch (rev 0)
+++ trunk/patches/nagios_bugfix_2628.patch 2013-02-26 20:33:13 UTC (rev 223)
@@ -0,0 +1,30 @@
+diff -ur nagios-4.0.20130107.original//base/checks.c nagios-4.0.20130107/base/checks.c
+--- nagios-4.0.20130107.original//base/checks.c 2013-02-26 17:10:48.000000000 +0000
++++ nagios-4.0.20130107/base/checks.c 2013-02-26 19:59:15.000000000 +0000
+@@ -464,7 +464,7 @@
+ else {
+
+ /* parse check output to get: (1) short output, (2) long output, (3) perf data */
+- parse_check_output(queued_check_result->output, &temp_service->plugin_output, &temp_service->long_plugin_output, &temp_service->perf_data, TRUE, TRUE);
++ parse_check_output(queued_check_result->output, &temp_service->plugin_output, &temp_service->long_plugin_output, &temp_service->perf_data, TRUE, FALSE);
+
+ /* make sure the plugin output isn't null */
+ if(temp_service->plugin_output == NULL)
+@@ -2212,7 +2212,7 @@
+ hst->check_type = CHECK_TYPE_ACTIVE;
+
+ /* parse the output: short and long output, and perf data */
+- parse_check_output(temp_plugin_output, &hst->plugin_output, &hst->long_plugin_output, &hst->perf_data, TRUE, TRUE);
++ parse_check_output(temp_plugin_output, &hst->plugin_output, &hst->long_plugin_output, &hst->perf_data, TRUE, FALSE);
+
+ /* free memory */
+ my_free(temp_plugin_output);
+@@ -2609,7 +2609,7 @@
+ my_free(temp_host->perf_data);
+
+ /* parse check output to get: (1) short output, (2) long output, (3) perf data */
+- parse_check_output(queued_check_result->output, &temp_host->plugin_output, &temp_host->long_plugin_output, &temp_host->perf_data, TRUE, TRUE);
++ parse_check_output(queued_check_result->output, &temp_host->plugin_output, &temp_host->long_plugin_output, &temp_host->perf_data, TRUE, FALSE);
+
+ /* make sure we have some data */
+ if(temp_host->plugin_output == NULL || !strcmp(temp_host->plugin_output, "")) {
