summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/imtcp/imtcp.c6
-rw-r--r--plugins/imzmq3/imzmq3.c6
-rw-r--r--plugins/mmnormalize/mmnormalize.c2
-rw-r--r--plugins/omelasticsearch/omelasticsearch.c2
-rw-r--r--plugins/omhiredis/omhiredis.c2
-rw-r--r--plugins/omlibdbi/omlibdbi.c2
-rw-r--r--plugins/ommongodb/ommongodb.c2
-rw-r--r--plugins/ommysql/ommysql.c2
-rw-r--r--plugins/omprog/omprog.c2
-rw-r--r--plugins/omsnmp/omsnmp.c2
-rw-r--r--plugins/omzmq3/omzmq3.c2
11 files changed, 16 insertions, 14 deletions
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
index eaf9a213..0cecb704 100644
--- a/plugins/imtcp/imtcp.c
+++ b/plugins/imtcp/imtcp.c
@@ -550,9 +550,9 @@ ENDactivateCnf
BEGINfreeCnf
instanceConf_t *inst, *del;
CODESTARTfreeCnf
- if(runModConf->permittedPeers != NULL) {
- cnfarrayContentDestruct(runModConf->permittedPeers);
- free(runModConf->permittedPeers);
+ if(pModConf->permittedPeers != NULL) {
+ cnfarrayContentDestruct(pModConf->permittedPeers);
+ free(pModConf->permittedPeers);
}
for(inst = pModConf->root ; inst != NULL ; ) {
free(inst->pszBindPort);
diff --git a/plugins/imzmq3/imzmq3.c b/plugins/imzmq3/imzmq3.c
index dc1d64d3..52c12a53 100644
--- a/plugins/imzmq3/imzmq3.c
+++ b/plugins/imzmq3/imzmq3.c
@@ -375,8 +375,10 @@ static rsRetVal createSocket(socket_info* info, void** sock) {
zsocket_set_rcvhwm(*sock, info->rcvHWM);
/* Set subscriptions.*/
- for (ii = 0; ii < sizeof(info->subscriptions)/sizeof(char*); ++ii)
- zsocket_set_subscribe(*sock, info->subscriptions[ii]);
+ if (info->type == ZMQ_SUB) {
+ for (ii = 0; ii < sizeof(info->subscriptions)/sizeof(char*); ++ii)
+ zsocket_set_subscribe(*sock, info->subscriptions[ii]);
+ }
diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
index bf0b9ce6..b5f4ce18 100644
--- a/plugins/mmnormalize/mmnormalize.c
+++ b/plugins/mmnormalize/mmnormalize.c
@@ -71,7 +71,7 @@ typedef struct _instanceData {
typedef struct configSettings_s {
uchar *rulebase; /**< name of normalization rulebase to use */
- sbool bUseRawMsg; /**< use %rawmsg% instead of %msg% */
+ int bUseRawMsg; /**< use %rawmsg% instead of %msg% */
} configSettings_t;
static configSettings_t cs;
diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c
index f77caeca..50acdf11 100644
--- a/plugins/omelasticsearch/omelasticsearch.c
+++ b/plugins/omelasticsearch/omelasticsearch.c
@@ -624,7 +624,7 @@ CODESTARTnewActInst
if(pData->dynSrchType) ++iNumTpls;
if(pData->dynParent) ++iNumTpls;
DBGPRINTF("omelasticsearch: requesting %d templates\n", iNumTpls);
- CODE_STD_STRING_REQUESTparseSelectorAct(iNumTpls)
+ CODE_STD_STRING_REQUESTnewActInst(iNumTpls)
CHKiRet(OMSRsetEntry(*ppOMSR, 0, (uchar*)strdup((pData->tplName == NULL) ?
" StdJSONFmt" : (char*)pData->tplName),
diff --git a/plugins/omhiredis/omhiredis.c b/plugins/omhiredis/omhiredis.c
index 5435094b..7c454436 100644
--- a/plugins/omhiredis/omhiredis.c
+++ b/plugins/omhiredis/omhiredis.c
@@ -174,7 +174,7 @@ CODESTARTnewActInst
CHKiRet(createInstance(&pData));
setInstParamDefaults(pData);
- CODE_STD_STRING_REQUESTparseSelectorAct(1)
+ CODE_STD_STRING_REQUESTnewActInst(1)
for(i = 0 ; i < actpblk.nParams ; ++i) {
if(!pvals[i].bUsed)
continue;
diff --git a/plugins/omlibdbi/omlibdbi.c b/plugins/omlibdbi/omlibdbi.c
index 8f5fa944..99bcaf9d 100644
--- a/plugins/omlibdbi/omlibdbi.c
+++ b/plugins/omlibdbi/omlibdbi.c
@@ -320,7 +320,7 @@ CODESTARTnewActInst
CHKiRet(createInstance(&pData));
setInstParamDefaults(pData);
- CODE_STD_STRING_REQUESTparseSelectorAct(1)
+ CODE_STD_STRING_REQUESTnewActInst(1)
for(i = 0 ; i < actpblk.nParams ; ++i) {
if(!pvals[i].bUsed)
continue;
diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c
index 0da6dc48..ed77f824 100644
--- a/plugins/ommongodb/ommongodb.c
+++ b/plugins/ommongodb/ommongodb.c
@@ -474,7 +474,7 @@ CODESTARTnewActInst
CHKiRet(createInstance(&pData));
setInstParamDefaults(pData);
- CODE_STD_STRING_REQUESTparseSelectorAct(1)
+ CODE_STD_STRING_REQUESTnewActInst(1)
for(i = 0 ; i < actpblk.nParams ; ++i) {
if(!pvals[i].bUsed)
continue;
diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c
index 253fc4c0..69ffb9ac 100644
--- a/plugins/ommysql/ommysql.c
+++ b/plugins/ommysql/ommysql.c
@@ -305,7 +305,7 @@ CODESTARTnewActInst
CHKiRet(createInstance(&pData));
setInstParamDefaults(pData);
- CODE_STD_STRING_REQUESTparseSelectorAct(1)
+ CODE_STD_STRING_REQUESTnewActInst(1)
for(i = 0 ; i < actpblk.nParams ; ++i) {
if(!pvals[i].bUsed)
continue;
diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c
index d71de320..6978a9d0 100644
--- a/plugins/omprog/omprog.c
+++ b/plugins/omprog/omprog.c
@@ -331,7 +331,7 @@ CODESTARTnewActInst
CHKiRet(createInstance(&pData));
setInstParamDefaults(pData);
- CODE_STD_STRING_REQUESTparseSelectorAct(1)
+ CODE_STD_STRING_REQUESTnewActInst(1)
for(i = 0 ; i < actpblk.nParams ; ++i) {
if(!pvals[i].bUsed)
continue;
diff --git a/plugins/omsnmp/omsnmp.c b/plugins/omsnmp/omsnmp.c
index e279c852..79e555b3 100644
--- a/plugins/omsnmp/omsnmp.c
+++ b/plugins/omsnmp/omsnmp.c
@@ -393,7 +393,7 @@ CODESTARTnewActInst
CHKiRet(createInstance(&pData));
setInstParamDefaults(pData);
- CODE_STD_STRING_REQUESTparseSelectorAct(1)
+ CODE_STD_STRING_REQUESTnewActInst(1)
for(i = 0 ; i < actpblk.nParams ; ++i) {
if(!pvals[i].bUsed)
continue;
diff --git a/plugins/omzmq3/omzmq3.c b/plugins/omzmq3/omzmq3.c
index e13011fb..ee6756b9 100644
--- a/plugins/omzmq3/omzmq3.c
+++ b/plugins/omzmq3/omzmq3.c
@@ -339,7 +339,7 @@ if((pvals = nvlstGetParams(lst, &actpblk, NULL)) == NULL) {
CHKiRet(createInstance(&pData));
setInstParamDefaults(pData);
-CODE_STD_STRING_REQUESTparseSelectorAct(1)
+CODE_STD_STRING_REQUESTnewActInst(1)
for(i = 0 ; i < actpblk.nParams ; ++i) {
if(!pvals[i].bUsed)
continue;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-24 02:58:43 +0000