diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-16 17:33:44 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-16 17:33:44 +0100 |
| commit | 71d8ae126af29cb5a4fa1f28a732f2bc9b86e8b6 (patch) | |
| tree | 211afcc184ce8b0c9888d124198908bbd510ec3f | |
| parent | f6d4f46eb539a78ecf12ecc02e700d59b5f0b748 (diff) | |
| parent | 2666c6d71c4761d6fc01ff1647d5774d2cea02dc (diff) | |
| download | rsyslog-71d8ae126af29cb5a4fa1f28a732f2bc9b86e8b6.tar.gz rsyslog-71d8ae126af29cb5a4fa1f28a732f2bc9b86e8b6.tar.bz2 rsyslog-71d8ae126af29cb5a4fa1f28a732f2bc9b86e8b6.zip | |
Merge branch 'v7-stable'
Conflicts:
plugins/imuxsock/imuxsock.c
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | doc/imuxsock.html | 3 | ||||
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 6 |
3 files changed, 8 insertions, 4 deletions
@@ -44,6 +44,9 @@ Version 7.5.7 [devel] 2013-11-?? Thanks to Tomas Heinrich for the patch. --------------------------------------------------------------------------- Version 7.4.7 [v7.4-stable] 2013-11-?? +- bugfix: imuxsock: UseSysTimeStamp config parameter did not work correctly + Thanks to Tomas Heinrich for alerting us and provinding a solution + suggestion. - bugfix: $SystemLogUseSysTimeStamp/$SystemLogUsePIDFromSystem did not work Thanks to Tomas Heinrich for the patch. - improved checking of queue config parameters on startup diff --git a/doc/imuxsock.html b/doc/imuxsock.html index 4e4500cc..02b2f187 100644 --- a/doc/imuxsock.html +++ b/doc/imuxsock.html @@ -94,7 +94,8 @@ burst in number of messages. Default is 200. <li><b>SysSock.RateLimit.Severity</b> [numerical severity] - specifies the severity of messages that shall be rate-limited. </li> -<li><b>SysSock.UseSysTimeStamp</b> [<b>on</b>/off] the same as $InputUnixListenSocketUseSysTimeStamp, but for the system log socket. +<li><b>SysSock.UseSysTimeStamp</b> [<b>on</b>/off] the same as the input parameter +UseSysTimeStamp, but for the system log socket. See description there. </li> <li><b>SysSock.Annotate</b> <on/<b>off</b>> turn on annotation/trusted properties for the system log socket.</li> diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 4b3556b1..a53ce159 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -398,7 +398,7 @@ addListner(instanceConf_t *inst) listeners[nfd].flags = inst->bIgnoreTimestamp ? IGNDATE : NOFLAG; listeners[nfd].bCreatePath = inst->bCreatePath; listeners[nfd].sockName = ustrdup(inst->sockName); - listeners[nfd].bUseCreds = (inst->bDiscardOwnMsgs || inst->bWritePid || inst->ratelimitInterval || inst->bAnnotate) ? 1 : 0; + listeners[nfd].bUseCreds = (inst->bDiscardOwnMsgs || inst->bWritePid || inst->ratelimitInterval || inst->bAnnotate || inst->bUseSysTimeStamp) ? 1 : 0; listeners[nfd].bAnnotate = inst->bAnnotate; listeners[nfd].bParseTrusted = inst->bParseTrusted; listeners[nfd].bDiscardOwnMsgs = inst->bDiscardOwnMsgs; @@ -985,7 +985,7 @@ static rsRetVal readSocket(lstn_t *pLstn) if(iRcvd > 0) { cred = NULL; ts = NULL; - if(pLstn->bUseCreds || pLstn->bUseSysTimeStamp) { + if(pLstn->bUseCreds) { for(cm = CMSG_FIRSTHDR(&msgh); cm; cm = CMSG_NXTHDR(&msgh, cm)) { # if HAVE_SCM_CREDENTIALS if( pLstn->bUseCreds @@ -1055,7 +1055,7 @@ activateListeners() listeners[0].ratelimitInterval = runModConf->ratelimitIntervalSysSock; listeners[0].ratelimitBurst = runModConf->ratelimitBurstSysSock; listeners[0].ratelimitSev = runModConf->ratelimitSeveritySysSock; - listeners[0].bUseCreds = (runModConf->bWritePidSysSock || runModConf->ratelimitIntervalSysSock || runModConf->bAnnotateSysSock || runModConf->bDiscardOwnMsgs) ? 1 : 0; + listeners[0].bUseCreds = (runModConf->bWritePidSysSock || runModConf->ratelimitIntervalSysSock || runModConf->bAnnotateSysSock || runModConf->bDiscardOwnMsgs || runModConf->bUseSysTimeStamp) ? 1 : 0; listeners[0].bWritePid = runModConf->bWritePidSysSock; listeners[0].bAnnotate = runModConf->bAnnotateSysSock; listeners[0].bParseTrusted = runModConf->bParseTrusted; |