diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-11 16:04:42 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-11 16:04:42 +0200 |
| commit | 7fb201ec4978885be699ca3d9d902260111faceb (patch) | |
| tree | 65a1770abaf8b7e1ef25685c2926f47dc1f596e6 /plugins/imuxsock | |
| parent | 9aec3a6e5f26c72005dc773d3e86915497cd4e4c (diff) | |
| parent | a53c2bca49ba0bb49719ebe570854d06ea7e1ca2 (diff) | |
| download | rsyslog-7fb201ec4978885be699ca3d9d902260111faceb.tar.gz rsyslog-7fb201ec4978885be699ca3d9d902260111faceb.tar.xz rsyslog-7fb201ec4978885be699ca3d9d902260111faceb.zip | |
Merge branch 'v5-stable' into v6-stable
Diffstat (limited to 'plugins/imuxsock')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index fe04c8f2..4b3a5d49 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -81,7 +81,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a /* emulate struct ucred for platforms that do not have it */ #ifndef HAVE_SCM_CREDENTIALS -struct ucred { int pid; }; +struct ucred { int pid; uid_t uid; gid_t gid; }; #endif /* handle some defines missing on more than one platform */ @@ -895,9 +895,7 @@ 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; struct timeval *ts; uchar bufRcv[4096+1]; |