rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-21 13:40:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2093 from rgerhards/cid-185366

Browse Source 
msg handling: emit error message if ruleset cannot be assigned to msg
This commit is contained in:
Rainer Gerhards 2017-11-23 18:01:57 +01:00 committed by GitHub
commit 326af71fbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
runtime/msg.c
View File

@ -474,13 +474,22 @@ static void MsgSetRcvFromWithoutAddRef(smsg_t *pThis, prop_t *new)
/* rgerhards 2012-04-18: set associated ruleset (by ruleset name)
* If ruleset cannot be found, no update is done.
* pRuleset pointer inside msg is updated. If ruleset cannot be found,
* no update is done and an error message emitted.
*/
static void
MsgSetRulesetByName(smsg_t * const pMsg, cstr_t *rulesetName)
static void ATTR_NONNULL()
MsgSetRulesetByName(smsg_t * const pMsg, cstr_t *const rulesetName)
{
/* coverity[checked_return] */ // KEEP TOGETHER WITH NEXT LINE!
rulesetGetRuleset(runConf, &(pMsg->pRuleset), rsCStrGetSzStrNoNULL(rulesetName));
uchar *const rs_name = rsCStrGetSzStrNoNULL(rulesetName);
const rsRetVal localRet =
rulesetGetRuleset(runConf, &(pMsg->pRuleset), rs_name);
if(localRet != RS_RET_OK) {
LogError(0, localRet, "msg: ruleset '%s' could not be found and could not "
"be assgined to message object. This possibly leads to the message "
"being processed incorrectly. We cannot do anything against this, but "
"wanted to let you know.", rs_name);
}
}
/* do a DNS reverse resolution, if not already done, reflect status