re-enable deprecated warings for omdiscard/omruleset

merge for action list functionality will follow soon
This commit is contained in:
Rainer Gerhards 2012-10-22 10:27:07 +02:00
parent b1635a867e
commit d82327c954
2 changed files with 0 additions and 8 deletions

View File

@ -165,12 +165,8 @@ 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) == ';')

View File

@ -95,13 +95,9 @@ 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;
}