diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -1,4 +1,8 @@ --------------------------------------------------------------------------- +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 +--------------------------------------------------------------------------- Version 5.10.0 [V5-STABLE], 2012-08-23 NOTE: this is the new rsyslog v5-stable, incorporating all changes from the diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index b0247d6e..76474724 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -386,7 +386,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; @@ -802,8 +804,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); |