diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:54:38 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:54:38 +0200 |
commit | ed36822e37b3328dc52c70f96c0a099f224edc1a (patch) | |
tree | d271ea51301cac4daddaa482a4f9ff6e27b145df /tools | |
parent | 0972943f5265dca1f56dcb25bd361d40040bef87 (diff) | |
parent | 0a24b3afc093e16038da170458e2ecb68b363bdd (diff) | |
download | rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.tar.gz rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.tar.xz rsyslog-ed36822e37b3328dc52c70f96c0a099f224edc1a.zip |
Merge branch 'v4-stable' into v5-stable
Conflicts:
configure.ac
runtime/cfsysline.c
tools/ompipe.c
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; } } |