diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-09 11:29:39 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-09 11:29:39 +0200 |
commit | acd140f653b694b36c4532548cfd69772b8931b4 (patch) | |
tree | d184aff83e2547c91d9b9f757d9ff2008c3d42ab /runtime/modules.c | |
parent | 5acc47276816962b4d4ec58fdbbef1def08d7a3f (diff) | |
parent | 86e34c6985da29c62f13ab83e44548f1fd21849d (diff) | |
download | rsyslog-acd140f653b694b36c4532548cfd69772b8931b4.tar.gz rsyslog-acd140f653b694b36c4532548cfd69772b8931b4.tar.bz2 rsyslog-acd140f653b694b36c4532548cfd69772b8931b4.zip |
Merge branch 'c7' into tmp
Conflicts:
ChangeLog
configure.ac
runtime/queue.c
Diffstat (limited to 'runtime/modules.c')
-rw-r--r-- | runtime/modules.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/modules.c b/runtime/modules.c index 9f7ff31c..e9d8d959 100644 --- a/runtime/modules.c +++ b/runtime/modules.c @@ -657,6 +657,10 @@ doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)(), modInfo_ if(localRet != RS_RET_OK && localRet != RS_RET_MODULE_ENTRY_POINT_NOT_FOUND) ABORT_FINALIZE(localRet); + localRet = (*pNew->modQueryEtryPt)((uchar*)"SetShutdownImmdtPtr", &pNew->mod.om.SetShutdownImmdtPtr); + if(localRet != RS_RET_OK && localRet != RS_RET_MODULE_ENTRY_POINT_NOT_FOUND) + ABORT_FINALIZE(localRet); + localRet = (*pNew->modQueryEtryPt)((uchar*)"beginTransaction", &pNew->mod.om.beginTransaction); if(localRet == RS_RET_MODULE_ENTRY_POINT_NOT_FOUND) pNew->mod.om.beginTransaction = dummyBeginTransaction; |