diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-22 20:18:58 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-22 20:18:58 +0200 |
commit | aa0701b100084d61df6fff10be48bb088f551932 (patch) | |
tree | 24acb326dccf074331b9556e959df72ae6307bef /tools | |
parent | 87472f58b4cd47762a7b134f0d8521cabc739cae (diff) | |
parent | 096db025e2c06045226f9f3c70386e3394d60bb2 (diff) | |
download | rsyslog-aa0701b100084d61df6fff10be48bb088f551932.tar.gz rsyslog-aa0701b100084d61df6fff10be48bb088f551932.tar.xz rsyslog-aa0701b100084d61df6fff10be48bb088f551932.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools')
-rw-r--r-- | tools/ompipe.c | 1 | ||||
-rw-r--r-- | tools/omusrmsg.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/ompipe.c b/tools/ompipe.c index cf22bc84..c51a5c48 100644 --- a/tools/ompipe.c +++ b/tools/ompipe.c @@ -42,6 +42,7 @@ #include <assert.h> #include <errno.h> #include <fcntl.h> +#include <unistd.h> #include <sys/file.h> #include "syslogd.h" diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index e788a006..e61751dc 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -143,7 +143,7 @@ void setutent(void) { assert(BSD_uf == NULL); if ((BSD_uf = fopen(_PATH_UTMP, "r")) == NULL) { - errmsg.LogError(NO_ERRCODE, "%s", _PATH_UTMP); + errmsg.LogError(0, NO_ERRCODE, "%s", _PATH_UTMP); return; } } |