From 206908e2887cedf78d12d70b29591c52276d685a Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 1 Nov 2012 17:05:07 +0100 Subject: bugfix: invalid rsyslog-internal macro API use This had no bad effect, because the macro did the same as the one that should have been used. --- plugins/omelasticsearch/omelasticsearch.c | 2 +- plugins/omhiredis/omhiredis.c | 2 +- plugins/omlibdbi/omlibdbi.c | 2 +- plugins/ommongodb/ommongodb.c | 2 +- plugins/ommysql/ommysql.c | 2 +- plugins/omprog/omprog.c | 2 +- plugins/omsnmp/omsnmp.c | 2 +- plugins/omzmq3/omzmq3.c | 2 +- tools/ompipe.c | 2 +- tools/omusrmsg.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) 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 f2de33df..d246fab4 100644 --- a/plugins/ommongodb/ommongodb.c +++ b/plugins/ommongodb/ommongodb.c @@ -467,7 +467,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; diff --git a/tools/ompipe.c b/tools/ompipe.c index d293114f..420e2b11 100644 --- a/tools/ompipe.c +++ b/tools/ompipe.c @@ -315,7 +315,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/tools/omusrmsg.c b/tools/omusrmsg.c index a7df9243..f4cc4094 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -348,7 +348,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; -- cgit v1.2.3 From 8995034e5a17f58445b69fe97b64ba5c46b5dccf Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 1 Nov 2012 19:07:08 +0100 Subject: doc: add recent patch (API) to ChangeLog --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 31320e49..0b3ca5a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ Version 6.6.1 [v6-stable] 2012-10-?? On many platforms, this has no effect at all. At some, it may cause a segfault. The problem occurs only during config phase, no segfault happens when rsyslog has fully started. +- fix API "glitch" in some plugins + This did not affect users, but could have caused trouble in the future + for developers. --------------------------------------------------------------------------- Version 6.6.0 [v6-stable] 2012-10-22 This starts a new stable branch, based on the 6.5.x series, plus: -- cgit v1.2.3