diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-04 18:33:31 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-04 18:33:31 +0100 |
| commit | 9bbd09b1d3c1a1e4562a6d5c2e7040c5a0efa39c (patch) | |
| tree | 235fab606de1613caa4934529277a7e0bcfe4acb /tools/syslogd.c | |
| parent | 25b223c0dcd3e8449a048c87bdab2ad899fd9dcc (diff) | |
| download | rsyslog-9bbd09b1d3c1a1e4562a6d5c2e7040c5a0efa39c.tar.gz rsyslog-9bbd09b1d3c1a1e4562a6d5c2e7040c5a0efa39c.tar.bz2 rsyslog-9bbd09b1d3c1a1e4562a6d5c2e7040c5a0efa39c.zip | |
cleanup: multiple rulesets inside a single batch are now OK
They don't require special handling any longer, so do no longer
care about them.
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 7597b05d..0fb9a9fe 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -503,17 +503,12 @@ preprocessBatch(batch_t *pBatch) { prop_t *localName; prop_t *propFromHost = NULL; prop_t *propFromHostIP = NULL; - int bSingleRuleset; - ruleset_t *batchRuleset; /* the ruleset used for all message inside the batch, if there is a single one */ int bIsPermitted; msg_t *pMsg; int i; rsRetVal localRet; DEFiRet; - bSingleRuleset = 1; - batchRuleset = (pBatch->nElem > 0) ? pBatch->pElem[0].pMsg->pRuleset : NULL; - for(i = 0 ; i < pBatch->nElem && !*(pBatch->pbShutdownImmediate) ; i++) { pMsg = pBatch->pElem[i].pMsg; if((pMsg->msgFlags & NEEDS_ACLCHK_U) != 0) { @@ -539,12 +534,8 @@ preprocessBatch(batch_t *pBatch) { pBatch->eltState[i] = BATCH_STATE_DISC; } } - if(pMsg->pRuleset != batchRuleset) - bSingleRuleset = 0; } - batchSetSingleRuleset(pBatch, bSingleRuleset); - finalize_it: if(propFromHost != NULL) prop.Destruct(&propFromHost); |