diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-12 14:40:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-12 14:40:29 +0200 |
| commit | 9aacbcb05656ebc8838dfc421f7dc9fd21bbfcb3 (patch) | |
| tree | 3b94745d7a6242359a06d28af5d757f32675700e | |
| parent | 7fb201ec4978885be699ca3d9d902260111faceb (diff) | |
| parent | 2d538f14e2bae1407a3fb22c4a5244247dda1e4b (diff) | |
| download | rsyslog-9aacbcb05656ebc8838dfc421f7dc9fd21bbfcb3.tar.gz rsyslog-9aacbcb05656ebc8838dfc421f7dc9fd21bbfcb3.tar.xz rsyslog-9aacbcb05656ebc8838dfc421f7dc9fd21bbfcb3.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 10 |
2 files changed, 11 insertions, 5 deletions
@@ -1,4 +1,5 @@ --------------------------------------------------------------------------- +<<<<<<< HEAD Version 6.4.1 [V6-STABLE] 2012-09-06 - bugfix: multiple main queues with same queue file name were not detected This lead to queue file corruption. While the root cause is a config @@ -551,6 +552,11 @@ expected that interfaces, even new ones, break during the initial - added imptcp, a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!) [ported from v4] +======= +Version 5.10.1 [V5-STABLE], 2012-0?-?? +- bugfix: remove invalid socket option call from imuxsock + Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom +>>>>>>> 2d538f14e2bae1407a3fb22c4a5244247dda1e4b --------------------------------------------------------------------------- Version 5.10.0 [V5-STABLE], 2012-08-23 diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 4b3a5d49..38934e3a 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -473,7 +473,9 @@ static inline rsRetVal openLogSocket(lstn_t *pLstn) { DEFiRet; +# if HAVE_SCM_CREDENTIALS int one; +# endif /* HAVE_SCM_CREDENTIALS */ if(pLstn->sockName[0] == '\0') return -1; @@ -514,10 +516,6 @@ openLogSocket(lstn_t *pLstn) errmsg.LogError(errno, NO_ERRCODE, "set SO_PASSCRED failed on '%s'", pLstn->sockName); pLstn->bUseCreds = 0; } - if(setsockopt(pLstn->fd, SOL_SOCKET, SCM_CREDENTIALS, &one, sizeof(one)) != 0) { - errmsg.LogError(errno, NO_ERRCODE, "set SCM_CREDENTIALS failed on '%s'", pLstn->sockName); - pLstn->bUseCreds = 0; - } // TODO: move to its own #if if(setsockopt(pLstn->fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one)) != 0) { errmsg.LogError(errno, NO_ERRCODE, "set SO_TIMESTAMP failed on '%s'", pLstn->sockName); @@ -899,8 +897,10 @@ static rsRetVal readSocket(lstn_t *pLstn) struct ucred *cred; struct timeval *ts; uchar bufRcv[4096+1]; - char aux[128]; uchar *pRcv = NULL; /* receive buffer */ +# if HAVE_SCM_CREDENTIALS + char aux[128]; +# endif assert(pLstn->fd >= 0); |