diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-06 07:40:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-06 07:40:12 +0200 |
| commit | e738369cf3713a46353c700ffa7eac4b78829f46 (patch) | |
| tree | f08a0c78fc5bfa7381658b8e009f983cd7927ca9 /runtime/modules.c | |
| parent | 2dcbe1c77ad2fd856955131ebe991cf8bf9add47 (diff) | |
| parent | d275d116fcdcff14ff71642cf7b4f563a2b42eff (diff) | |
| download | rsyslog-e738369cf3713a46353c700ffa7eac4b78829f46.tar.gz rsyslog-e738369cf3713a46353c700ffa7eac4b78829f46.tar.bz2 rsyslog-e738369cf3713a46353c700ffa7eac4b78829f46.zip | |
Merge branch 'v7-stable'
Diffstat (limited to 'runtime/modules.c')
| -rw-r--r-- | runtime/modules.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/modules.c b/runtime/modules.c index e9d8d959..56606306 100644 --- a/runtime/modules.c +++ b/runtime/modules.c @@ -1045,7 +1045,6 @@ Load(uchar *pModName, sbool bConfLoad, struct nvlst *lst) if(bConfLoad) { localRet = readyModForCnf(pModInfo, &pNew, &pLast); if(pModInfo->setModCnf != NULL && localRet == RS_RET_OK) { - addModToCnfList(pNew, pLast); if(!strncmp((char*)pModName, "builtin:", sizeof("builtin:")-1)) { if(pModInfo->bSetModCnfCalled) { errmsg.LogError(0, RS_RET_DUP_PARAM, @@ -1061,6 +1060,11 @@ Load(uchar *pModName, sbool bConfLoad, struct nvlst *lst) pModInfo->setModCnf(lst); pModInfo->bSetModCnfCalled = 1; } + } else { + /* regular modules need to be added to conf list (for + * builtins, this happend during initial load). + */ + addModToCnfList(pNew, pLast); } } } |