Title: [opsview-base] [215] Fix from core Nagios project for hosts with funny characters (causes Hudson test failure)
- Revision
- 215
- Author
- tvoon
- Date
- 2013-02-18 14:10:45 +0000 (Mon, 18 Feb 2013)
Log Message
Fix from core Nagios project for hosts with funny characters (causes Hudson test failure)
Modified Paths
Added Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2013-02-15 15:18:32 UTC (rev 214)
+++ trunk/Makefile 2013-02-18 14:10:45 UTC (rev 215)
@@ -586,6 +586,8 @@
cd ${NAGIOS} && patch -p1 < ../patches/nagios_statusmap_reduce_nagios_process_text.patch
# Patch below already in nagios, commit 2599
cd ${NAGIOS} && patch -p1 < ../patches/nagios_handle_escape_characters.patch
+ # Patch below already in nagios, commit 2608
+ cd ${NAGIOS} && patch -p1 < ../patches/nagios_cgi_error_for_hosts_with_umlats.patch
if [ $(KERNEL_NAME) = Linux ] ; then \
cd ${NAGIOS} && CFLAGS="${CFLAGS}" ./configure --with-nagios-user=$(NAGIOS_USER) --with-nagios-group=$(NAGIOS_GROUP) --with-command-group=$(NAGIOS_GROUP) --with-cgiurl=/cgi-bin --with-htmurl=/ --enable-libtap ; \
elif [ $(KERNEL_NAME) = Darwin ] ; then \
Added: trunk/patches/nagios_cgi_error_for_hosts_with_umlats.patch
===================================================================
--- trunk/patches/nagios_cgi_error_for_hosts_with_umlats.patch (rev 0)
+++ trunk/patches/nagios_cgi_error_for_hosts_with_umlats.patch 2013-02-18 14:10:45 UTC (rev 215)
@@ -0,0 +1,12 @@
+diff -ur nagios-4.0.20130107.original/cgi/cgiutils.c nagios-4.0.20130107/cgi/cgiutils.c
+--- nagios-4.0.20130107.original/cgi/cgiutils.c 2013-02-16 22:06:56.000000000 +0000
++++ nagios-4.0.20130107/cgi/cgiutils.c 2013-02-16 22:09:12.000000000 +0000
+@@ -917,7 +917,7 @@
+ else {
+ str[y] = '\x0';
+ if((int)strlen(str) < (output_len - 3)) {
+- sprintf(temp_expansion, "%%%02X", (unsigned int)input[x]);
++ sprintf(temp_expansion, "%%%02X", (unsigned char)input[x]);
+ strcat(str, temp_expansion);
+ y += 3;
+ }
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
