diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-02-02 16:47:19 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-02-02 16:47:19 +0100 |
| commit | 5494790ece676ca0a07c0a62cb457338ec4cec90 (patch) | |
| tree | 2f5cc27bb928d688d47435dd3823a89c7bb0c2dd /action.c | |
| parent | 03cf2a5113e130e4f64b048dc4dc6d2c0aa1b3b2 (diff) | |
| download | rsyslog-5494790ece676ca0a07c0a62cb457338ec4cec90.tar.gz rsyslog-5494790ece676ca0a07c0a62cb457338ec4cec90.tar.xz rsyslog-5494790ece676ca0a07c0a62cb457338ec4cec90.zip | |
bugfix: abort during startup when rsyslog.conf v6+ format was used in a certain way
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1815,10 +1815,11 @@ doSubmitToActionQComplexBatch(action_t *pAction, batch_t *pBatch) * Defaults must have been set appropriately during action construct! * rgerhards, 2011-08-01 */ -rsRetVal +static rsRetVal actionApplyCnfParam(action_t *pAction, struct cnfparamvals *pvals) { int i; + for(i = 0 ; i < pblk.nParams ; ++i) { if(!pvals[i].bUsed) continue; @@ -1847,7 +1848,6 @@ actionApplyCnfParam(action_t *pAction, struct cnfparamvals *pvals) "param '%s'\n", pblk.descr[i].name); } } - cnfparamvalsDestruct(pvals, &pblk); return RS_RET_OK; } |