[opsview-base] [434] count newline as nasty metachar in nrpe

[s...@opsview.com]

Revision

434

Author

aburzynski

Date

2014-04-22 11:30:08 +0100 (Tue, 22 Apr 2014)

Log Message

count newline as nasty metachar in nrpe

Modified Paths

• trunk/Makefile

Added Paths

• trunk/patches/nrpe_nasty_newline.patch

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2014-04-11 08:40:24 UTC (rev 433)
+++ trunk/Makefile	2014-04-22 10:30:08 UTC (rev 434)
@@ -692,6 +692,7 @@
 	cd ${NRPE} && patch -p1 < ../patches/nrpe_show_system_info.patch
 	# Below is required for NRPE 2.14 as autoconf fails otherwise
 	cd ${NRPE} && patch -p1 < ../patches/nrpe_fix_autoconf.patch
+	cd ${NRPE} && patch -p1 < ../patches/nrpe_nasty_newline.patch
 	cd ${NRPE} && autoconf
 	#make customer-hook MACRO=patch APP=nrpe DIR=${NRPE}
 	if [ $(KERNEL_NAME) = SunOS ] ; then \

Added: trunk/patches/nrpe_nasty_newline.patch
===================================================================
--- trunk/patches/nrpe_nasty_newline.patch	                        (rev 0)
+++ trunk/patches/nrpe_nasty_newline.patch	2014-04-22 10:30:08 UTC (rev 434)
@@ -0,0 +1,13 @@
+diff -ur nrpe-2.14.orig/src/nrpe.c nrpe-2.14/src/nrpe.c
+--- nrpe-2.14.orig/src/nrpe.c	2014-04-22 10:15:15.000000000 +0000
++++ nrpe-2.14/src/nrpe.c	2014-04-22 10:16:56.000000000 +0000
+@@ -50,7 +50,8 @@
+ #define DEFAULT_COMMAND_TIMEOUT	60			/* default timeout for execution of plugins */
+ #define MAXFD                   64
+ /* Altinity patch: Removed " from nasty characters */
+-#define NASTY_METACHARS         "|`&><'\\[]{};"
++/* Opsview patch: add newline as nasty char */
++#define NASTY_METACHARS         "|`&><'\\[]{};\n"
+ 
+ char    *command_name=NULL;
+ char    *macro_argv[MAX_COMMAND_ARGUMENTS];