diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-25 10:06:10 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-25 10:06:10 +0200 |
| commit | 2005d52a8babf01c5a6d276e726185c8a932ac1f (patch) | |
| tree | 0d284870c4fc5947ef124fc5ee0b823a07f49f19 /plugins/imtcp/imtcp.c | |
| parent | ef5887e864307486f0fe07a23ed9ea7c4789dc11 (diff) | |
| parent | 5941ce7720393d28f04fac817ebcd21936c1ec8d (diff) | |
| download | rsyslog-2005d52a8babf01c5a6d276e726185c8a932ac1f.tar.gz rsyslog-2005d52a8babf01c5a6d276e726185c8a932ac1f.tar.bz2 rsyslog-2005d52a8babf01c5a6d276e726185c8a932ac1f.zip | |
Merge branch 'v7-stable'
Diffstat (limited to 'plugins/imtcp/imtcp.c')
| -rw-r--r-- | plugins/imtcp/imtcp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c index fc22d452..2d9761cb 100644 --- a/plugins/imtcp/imtcp.c +++ b/plugins/imtcp/imtcp.c @@ -141,6 +141,7 @@ static struct cnfparamdescr modpdescr[] = { { "addtlframedelimiter", eCmdHdlrPositiveInt, 0 }, { "maxsessions", eCmdHdlrPositiveInt, 0 }, { "maxlistners", eCmdHdlrPositiveInt, 0 }, + { "maxlisteners", eCmdHdlrPositiveInt, 0 }, { "streamdriver.mode", eCmdHdlrPositiveInt, 0 }, { "streamdriver.authmode", eCmdHdlrString, 0 }, { "permittedpeer", eCmdHdlrArray, 0 }, @@ -453,7 +454,8 @@ CODESTARTsetModCnf loadModConf->iAddtlFrameDelim = (int) pvals[i].val.d.n; } else if(!strcmp(modpblk.descr[i].name, "maxsessions")) { loadModConf->iTCPSessMax = (int) pvals[i].val.d.n; - } else if(!strcmp(modpblk.descr[i].name, "maxlistners")) { + } else if(!strcmp(modpblk.descr[i].name, "maxlisteners") || + !strcmp(modpblk.descr[i].name, "maxlistners")) { /* keep old name for a while */ loadModConf->iTCPLstnMax = (int) pvals[i].val.d.n; } else if(!strcmp(modpblk.descr[i].name, "keepalive")) { loadModConf->bKeepAlive = (int) pvals[i].val.d.n; |