remove unused variables (if SCM_CREDENTIALS is not available)

This commit is contained in:
Cristian Ionescu-Idbohrn 2012-09-12 12:59:38 +02:00 committed by Rainer Gerhards
parent d1de4cbd92
commit 2d538f14e2
2 changed files with 9 additions and 1 deletions

View File

@ -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

View File

@ -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);