diff options
-rw-r--r-- | plugins/omruleset/omruleset.c | 4 | ||||
-rw-r--r-- | tools/omdiscard.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c index 6c770c94..d1d6eb00 100644 --- a/plugins/omruleset/omruleset.c +++ b/plugins/omruleset/omruleset.c @@ -165,8 +165,12 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) p += sizeof(":omruleset:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ CHKiRet(createInstance(&pData)); + /* re-enable in v7.3: requires action list to support + * action-like statements, something that is too late to + * do in 7.1. errmsg.LogError(0, RS_RET_DEPRECATED, "warning: omruleset is deprecated, consider " "using the 'call' statement instead"); + */ /* check if a non-standard template is to be applied */ if(*(p-1) == ';') diff --git a/tools/omdiscard.c b/tools/omdiscard.c index 15c6ea82..08cd7491 100644 --- a/tools/omdiscard.c +++ b/tools/omdiscard.c @@ -95,9 +95,13 @@ CODE_STD_STRING_REQUESTparseSelectorAct(0) if(*p == '~') { dbgprintf("discard\n"); + /* re-enable in v7.3: requires action list to support + * action-like statements, something that is too late to + * do in 7.1. errmsg.LogError(0, RS_RET_DEPRECATED, "warning: ~ action " "is deprecated, consider using the 'stop' " "statement instead"); + */ } else { iRet = RS_RET_CONFLINE_UNPROCESSED; } |