Merge pull request #3658 from rgerhards/i2520

bugfix: error messages if config.enabled="off" is used

grammar/rainerscript.c

@@ -1156,7 +1156,7 @@ done:	return r;
  * it is the caller's duty to free it when no longer needed.
  * NULL is returned on error, otherwise a pointer to the vals array.
  */
-struct cnfparamvals*
+struct cnfparamvals* ATTR_NONNULL(2)
 nvlstGetParams(struct nvlst *lst, struct cnfparamblk *params,
 	       struct cnfparamvals *vals)
 {
@@ -1213,8 +1213,12 @@ nvlstGetParams(struct nvlst *lst, struct cnfparamblk *params,
 	if((valnode = nvlstFindNameCStr(lst, "config.enabled")) != NULL) {
 		if(es_strbufcmp(valnode->val.d.estr, (unsigned char*) "on", 2)) {
 			dbgprintf("config object disabled by configuration\n");
-			valnode->bUsed = 1;
+			/* flag all params as used to not emit error mssages */
 			bInError = 1;
+			struct nvlst *val;
+			for(val = lst; val != NULL ; val = val->next) {
+				val->bUsed = 1;
+			}
 		}
 	}
 

tests/Makefile.am

@@ -1283,7 +1283,8 @@ TESTS += \
 	imfile-logrotate-copytruncate.sh \
 	imfile-logrotate-nocopytruncate.sh \
 	imfile-growing-file-id.sh \
-	glbl-oversizeMsg-truncate-imfile.sh
+	glbl-oversizeMsg-truncate-imfile.sh \
+	config_enabled-off.sh
 
 if ENABLE_MMNORMALIZE
 TESTS += \
@@ -1404,6 +1405,7 @@ EXTRA_DIST= \
 	glbl-internalmsg_severity-debug-shown.sh \
 	glbl-internalmsg_severity-debug-not_shown.sh \
 	glbl-oversizeMsg-log-vg.sh \
+	config_enabled-off.sh \
 	empty-hostname.sh \
 	hostname-getaddrinfo-fail.sh \
 	hostname-with-slash-pmrfc5424.sh \

tests/config_enabled-off.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+# check disabling a config construct via config.enable. Most
+# importantly ensure that it does not emit any error messages
+# for object parameters.
+# addd 2019-05-09 by RGerhards, released under ASL 2.0
+. ${srcdir:=.}/diag.sh init
+generate_conf
+add_conf '
+module(load="../plugins/imfile/.libs/imfile")
+input(type="imfile" file="/tmp/notyet.txt" tag="testing-tag" config.enabled="off")
+action(type="omfile" file="'$RSYSLOG_OUT_LOG'")
+'
+startup
+shutdown_when_empty
+wait_shutdown
+check_not_present 'parameter .* not known'
+exit_test