summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-06 11:50:27 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-06 11:50:27 +0100
commit1e20ff6b71aa19ca45ae7e68421370c830141af2 (patch)
tree8e412e7d261def92fe872db569e7462cb079d9ed /action.c
parent34d051c27a0e92535c9d0dad6705ecd8bf5355f8 (diff)
downloadrsyslog-1e20ff6b71aa19ca45ae7e68421370c830141af2.tar.gz
rsyslog-1e20ff6b71aa19ca45ae7e68421370c830141af2.tar.bz2
rsyslog-1e20ff6b71aa19ca45ae7e68421370c830141af2.zip
enforce that actions can no longer "do something" on action creation
This doesn't play well with config load/priv drop and was not strictly enforced in v7.
Diffstat (limited to 'action.c')
-rw-r--r--action.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/action.c b/action.c
index 718d9038..bae4e589 100644
--- a/action.c
+++ b/action.c
@@ -1456,7 +1456,7 @@ actionApplyCnfParam(action_t *pAction, struct cnfparamvals *pvals)
rsRetVal
addAction(action_t **ppAction, modInfo_t *pMod, void *pModData,
omodStringRequest_t *pOMSR, struct cnfparamvals *actParams,
- struct nvlst *lst, int bSuspended)
+ struct nvlst *lst)
{
DEFiRet;
int i;
@@ -1544,14 +1544,9 @@ addAction(action_t **ppAction, modInfo_t *pMod, void *pModData,
pAction->pMod = pMod;
pAction->pModData = pModData;
-// TODO #warning we need to look at the following
- // Probably the core init needs to be done during createWrkrInstance()
- //if(bSuspended)
- // actionSuspend(pAction, pWti);
-
CHKiRet(actionConstructFinalize(pAction, lst));
- /* TODO: if we exit here, we have a memory leak... */
+ /* TODO: if we exit here, we have a (quite acceptable...) memory leak */
*ppAction = pAction; /* finally store the action pointer */
@@ -1638,8 +1633,7 @@ actionNewInst(struct nvlst *lst, action_t **ppAction)
FINALIZE; /* iRet is already set to error state */
}
- if((iRet = addAction(&pAction, pMod, pModData, pOMSR, paramvals, lst,
- (iRet == RS_RET_SUSPENDED)? 1 : 0)) == RS_RET_OK) {
+ if((iRet = addAction(&pAction, pMod, pModData, pOMSR, paramvals, lst)) == RS_RET_OK) {
/* check if the module is compatible with select features
* (currently no such features exist) */
loadConf->actions.nbrActions++; /* one more active action! */