Parser: Allow CGIs to not fail on command CVs.

Fixes #5940
Icinga · Apr 4, 2014 · d1ded75 · d1ded75
1 parent 2875c96
commit d1ded75
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Changelog b/Changelog
@@ -26,6 +26,7 @@ NEWS
 FIXES
 
 * core: fix regex using servicegroup members *,service fails to expand after lookup (Ricardo Melo) #3881 - MF
+* classic ui: fix parser bailing on command object custom variables (Icinga 2 only) #5940 - MF
 
 
 1.11.1 - 28/03/2014

diff --git a/docbook b/docbook
diff --git a/xdata/xodtemplate.c b/xdata/xodtemplate.c
@@ -1404,6 +1404,10 @@ int xodtemplate_add_object_property(char *input, int options) {
 				result = ERROR;
 		} else if (!strcmp(variable, "register"))
 			temp_command->register_object = (atoi(value) > 0) ? TRUE : FALSE;
+		else if (variable[0] == '_') {
+#ifdef NSCORE
+			logit(NSLOG_CONFIG_ERROR, TRUE, "Warning: ignoring unused custom variable in command object directive '%s'.\n", variable);
+#endif
 		else {
 			logit(NSLOG_CONFIG_ERROR, TRUE, "Error: Invalid command object directive '%s'.\n", variable);
 			return ERROR;