diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-24 14:42:56 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-24 14:42:56 +0100 |
| commit | 0ed775c9ed5965cf61ffd7f4893de144c7168517 (patch) | |
| tree | ec783e9ecc682796851c4e58758591f76a17ff7d | |
| parent | 876294adac24792ffc95f075a9b5b79e2b99a1b2 (diff) | |
| parent | 7bccae395b83416be6bea2de69fdfcce46995acf (diff) | |
| download | rsyslog-0ed775c9ed5965cf61ffd7f4893de144c7168517.tar.gz rsyslog-0ed775c9ed5965cf61ffd7f4893de144c7168517.tar.xz rsyslog-0ed775c9ed5965cf61ffd7f4893de144c7168517.zip | |
Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index ff38852c..7ee413e7 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -606,7 +606,9 @@ static rsRetVal readSocket(lstn_t *pLstn) int iMaxLine; struct msghdr msgh; struct iovec msgiov; +# if HAVE_SCM_CREDENTIALS struct cmsghdr *cm; +# endif struct ucred *cred; uchar bufRcv[4096+1]; char aux[128]; @@ -630,11 +632,13 @@ static rsRetVal readSocket(lstn_t *pLstn) memset(&msgh, 0, sizeof(msgh)); memset(&msgiov, 0, sizeof(msgiov)); +# if HAVE_SCM_CREDENTIALS if(pLstn->bUseCreds) { memset(&aux, 0, sizeof(aux)); msgh.msg_control = aux; msgh.msg_controllen = sizeof(aux); } +# endif msgiov.iov_base = pRcv; msgiov.iov_len = iMaxLine; msgh.msg_iov = &msgiov; |