diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-20 15:14:38 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-20 15:14:38 +0100 |
| commit | 37e876b7d029b713929d46556edb85c3f25e8bb5 (patch) | |
| tree | 827fd85fc3a5b3434ce33ee319146685675d74cb | |
| parent | cbe737ed06667b5bcb15f332061ebcde8d50bc8b (diff) | |
| parent | 144f0858b7250ceffe4828712126146345e0e92a (diff) | |
| download | rsyslog-37e876b7d029b713929d46556edb85c3f25e8bb5.tar.gz rsyslog-37e876b7d029b713929d46556edb85c3f25e8bb5.tar.bz2 rsyslog-37e876b7d029b713929d46556edb85c3f25e8bb5.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 3 | ||||
| -rw-r--r-- | tools/pmrfc3164.c | 2 |
3 files changed, 10 insertions, 1 deletions
@@ -195,6 +195,12 @@ Version 7.2.7 [v7-stable] 2013-03-?? - improved debugging support in forked (auto-backgrounding) mode The rsyslog debug log file is now continued to be written across the fork. +- bugfix: imuxsock rate-limiting could not be configured via legacy conf + Rate-limiting for the system socket could not be configured via legacy + configuration directives. However, the new-style RainerScript config + options worked. + Thanks to Milan Bartos for the patch. + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=390 - bugfix: using group resolution could lead to endless loop Thanks to Tomas Heinrich for the patch. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=310 diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 773cb8db..178c73b3 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -1243,6 +1243,9 @@ CODESTARTendCnfLoad loadModConf->bUseFlowCtl = cs.bUseFlowCtlSysSock; loadModConf->bAnnotateSysSock = cs.bAnnotateSysSock; loadModConf->bParseTrusted = cs.bParseTrusted; + loadModConf->ratelimitIntervalSysSock = cs.ratelimitIntervalSysSock; + loadModConf->ratelimitBurstSysSock = cs.ratelimitBurstSysSock; + loadModConf->ratelimitSeveritySysSock = cs.ratelimitSeveritySysSock; } loadModConf = NULL; /* done loading */ diff --git a/tools/pmrfc3164.c b/tools/pmrfc3164.c index bcded428..5dfa74f0 100644 --- a/tools/pmrfc3164.c +++ b/tools/pmrfc3164.c @@ -138,7 +138,7 @@ CODESTARTparse */ if(lenMsg > 0 && pMsg->msgFlags & PARSE_HOSTNAME) { i = 0; - while(i < lenMsg && (isalnum(p2parse[i]) || p2parse[i] == '.' || p2parse[i] == '.' + while(i < lenMsg && (isalnum(p2parse[i]) || p2parse[i] == '.' || p2parse[i] == '_' || p2parse[i] == '-') && i < (CONF_HOSTNAME_MAXSIZE - 1)) { bufParseHOSTNAME[i] = p2parse[i]; ++i; |