[icinga-checkins] icinga.org: icinga-core/rdarrud/cgis: fix custom macros being cleaned/ stripped (as they are user-defined and should be trusted) (Peter Morch)

git at icinga.org git at icinga.org
Thu Sep 16 21:46:43 CEST 2010


Module: icinga-core
Branch: rdarrud/cgis
Commit: 01887e39a0fa1857d72f1837b5fa46d5d5cc63e5
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=01887e39a0fa1857d72f1837b5fa46d5d5cc63e5

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Sep  1 18:15:51 2010 +0200

fix custom macros being cleaned/stripped (as they are user-defined and should be trusted) (Peter Morch)

as described in the issue, cleaning/stripping shouldn't be done.
$ARGn$ isn't either.
code is removed, since the scm handles history.

refs #752

---

 Changelog       |    1 +
 THANKS          |    1 +
 common/macros.c |    3 ---
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index 8c6c791..24072f9 100644
--- a/Changelog
+++ b/Changelog
@@ -19,6 +19,7 @@ FIXES
 * core: fix send comments to the broker with proper expiration_time (Matthieu Kermagoret)
 * core: fix segfault in escalation conditions when using object tricks (Vitali Voroth)
 * core: fix for event execution loop re-scheduling host checks instead of executing them if service checks are disabled (Ethan Galstad)
+* core: fix custom macros being cleaned/stripped (as they are user-defined and should be trusted) (Peter Morch)
 
 * classic ui: update jquery for multiple cmds dropdown, resolve conflicts with pnp
 * classic ui: fix delay sorting of comments/downtimes (Ton Voon)
diff --git a/THANKS b/THANKS
index e2b648b..97ed7a3 100644
--- a/THANKS
+++ b/THANKS
@@ -187,6 +187,7 @@ in various ways.  If we missed your name, let us know.
 * Martin Mielke
 * Christian Mies
 * Gary Miller
+* Peter Morch
 * James Moseley
 * Tobias Mucke
 * Gerd Mueller
diff --git a/common/macros.c b/common/macros.c
index 440df13..e7463b4 100644
--- a/common/macros.c
+++ b/common/macros.c
@@ -584,9 +584,6 @@ int grab_macro_value(char *macro_buffer, char **output, int *clean_options, int
 		/* get the macro value */
 		result=grab_custom_macro_value(macro_name,arg[0],arg[1],output);
 
-		/* custom variable values get cleaned */
-		if(result==OK)
-			*clean_options|=(STRIP_ILLEGAL_MACRO_CHARS|ESCAPE_MACRO_CHARS);
 		}
 
 	/* no macro matched... */





More information about the icinga-checkins mailing list