diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-12 15:11:15 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-12 15:11:15 +0200 |
| commit | 79d4e59e713413849358a60e044b1dd36c6b8888 (patch) | |
| tree | b20071fe81e106f4eb41c33da89367b36f663538 /plugins | |
| parent | a65ddad8652218ad8990b3de14b9293ce4cb556f (diff) | |
| parent | 70ee0f5b2e580b75782c039c5bb9d014a81195f4 (diff) | |
| download | rsyslog-79d4e59e713413849358a60e044b1dd36c6b8888.tar.gz rsyslog-79d4e59e713413849358a60e044b1dd36c6b8888.tar.xz rsyslog-79d4e59e713413849358a60e044b1dd36c6b8888.zip | |
Merge branch 'v6-devel'
Conflicts:
grammar/grammar.y
grammar/lexer.l
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 6507fde8..a2c53b52 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -484,7 +484,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; @@ -525,10 +527,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); @@ -961,8 +959,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); |