diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-06 10:06:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-06 10:06:32 +0200 |
| commit | ff2bb192f2c566f189a9d104d83d7a70c7888774 (patch) | |
| tree | 7737c436f7f3ed611535879654d59e672cfd69c3 /plugins | |
| parent | b056c258d7bab528034ec8c8749cdcf0d0102268 (diff) | |
| download | rsyslog-ff2bb192f2c566f189a9d104d83d7a70c7888774.tar.gz rsyslog-ff2bb192f2c566f189a9d104d83d7a70c7888774.tar.xz rsyslog-ff2bb192f2c566f189a9d104d83d7a70c7888774.zip | |
step: conf interface now natively supports priv drop
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imtcp/imtcp.c | 12 | ||||
| -rw-r--r-- | plugins/imudp/imudp.c | 10 |
2 files changed, 18 insertions, 4 deletions
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c index 75987aed..3978ff5d 100644 --- a/plugins/imtcp/imtcp.c +++ b/plugins/imtcp/imtcp.c @@ -266,6 +266,7 @@ addListner(modConfData_t *modConf, instanceConf_t *inst) } /* initialized, now add socket and listener params */ + DBGPRINTF("imtcp: trying to add port *:%s\n", inst->pszBindPort); CHKiRet(tcpsrv.SetRuleset(pOurTcpsrv, inst->pBindRuleset)); CHKiRet(tcpsrv.SetInputName(pOurTcpsrv, inst->pszInputName == NULL ? UCHAR_CONSTANT("imtcp") : inst->pszInputName)); @@ -329,9 +330,9 @@ CODESTARTcheckCnf ENDcheckCnf -BEGINactivateCnf +BEGINactivateCnfPrePrivDrop instanceConf_t *inst; -CODESTARTactivateCnf +CODESTARTactivateCnfPrePrivDrop runModConf = pModConf; for(inst = runModConf->root ; inst != NULL ; inst = inst->next) { addListner(pModConf, inst); @@ -339,6 +340,12 @@ CODESTARTactivateCnf if(pOurTcpsrv == NULL) ABORT_FINALIZE(RS_RET_NO_RUN); finalize_it: +ENDactivateCnfPrePrivDrop + + +BEGINactivateCnf +CODESTARTactivateCnf + /* sorry, nothing to do here... */ ENDactivateCnf @@ -422,6 +429,7 @@ BEGINqueryEtryPt CODESTARTqueryEtryPt CODEqueryEtryPt_STD_IMOD_QUERIES CODEqueryEtryPt_STD_CONF2_QUERIES +CODEqueryEtryPt_STD_CONF2_PREPRIVDROP_QUERIES CODEqueryEtryPt_IsCompatibleWithFeature_IF_OMOD_QUERIES ENDqueryEtryPt diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c index ee5c39e5..0df80e87 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -657,9 +657,9 @@ CODESTARTcheckCnf ENDcheckCnf -BEGINactivateCnf +BEGINactivateCnfPrePrivDrop instanceConf_t *inst; -CODESTARTactivateCnf +CODESTARTactivateCnfPrePrivDrop runModConf = pModConf; for(inst = runModConf->root ; inst != NULL ; inst = inst->next) { addListner(inst); @@ -672,7 +672,12 @@ CODESTARTactivateCnf } setSchedParams(pModConf); +finalize_it: +ENDactivateCnfPrePrivDrop + +BEGINactivateCnf +CODESTARTactivateCnf /* caching various settings */ iMaxLine = glbl.GetMaxLine(); CHKmalloc(pRcvBuf = MALLOC((iMaxLine + 1) * sizeof(char))); @@ -745,6 +750,7 @@ BEGINqueryEtryPt CODESTARTqueryEtryPt CODEqueryEtryPt_STD_IMOD_QUERIES CODEqueryEtryPt_STD_CONF2_QUERIES +CODEqueryEtryPt_STD_CONF2_PREPRIVDROP_QUERIES CODEqueryEtryPt_IsCompatibleWithFeature_IF_OMOD_QUERIES ENDqueryEtryPt |