diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-11 11:25:06 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-11 11:25:06 +0100 |
| commit | c90079aaf07ed574b11ade34af899cb4980ac9f5 (patch) | |
| tree | aa64dd94b2fa20656b53f3f09f706df28ec8f52e | |
| parent | 1b84d5998926df6ef1b2bbfc9fe5a59a80c5564c (diff) | |
| download | rsyslog-c90079aaf07ed574b11ade34af899cb4980ac9f5.tar.gz rsyslog-c90079aaf07ed574b11ade34af899cb4980ac9f5.tar.xz rsyslog-c90079aaf07ed574b11ade34af899cb4980ac9f5.zip | |
fixed some compile issues in recent systemd patch
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 4 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index e456a113..75f97db4 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -381,7 +381,7 @@ openLogSocket(lstn_t *pLstn) int fd; for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + sd_fds; fd++) { - if( sd_is_socket_unix(fd, SOCK_DGRAM, -1, pLstn->sockName, 0) == 1) { + if( sd_is_socket_unix(fd, SOCK_DGRAM, -1, (const char*) pLstn->sockName, 0) == 1) { /* ok, it matches -- just use as is */ pLstn->fd = fd; @@ -767,7 +767,7 @@ CODESTARTwillRun sd_fds = sd_listen_fds(0); if (sd_fds < 0) { - errmsg.LogError(-r, NO_ERRCODE, "imuxsock: Failed to acquire systemd socket"); + errmsg.LogError(-sd_fds, NO_ERRCODE, "imuxsock: Failed to acquire systemd socket"); ABORT_FINALIZE(RS_RET_ERR_CRE_AFUX); } diff --git a/tools/syslogd.c b/tools/syslogd.c index 52c0be5f..cdb31ef6 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2440,7 +2440,7 @@ doGlblProcessInit(void) char buf[24] = { '\0' }; char *p = NULL; unsigned long l; - int fds; + int sd_fds; /* fork & systemd socket activation: * fetch listen pid and update to ours, |