diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:44:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-19 12:44:22 +0200 |
| commit | ec339c909734759e957065d00848abfcdfdfaf8f (patch) | |
| tree | 6c04178f35c7990af56fb74194b491ce91c51e47 /tools | |
| parent | 9d98af3407423e723c114f009bd0915099580b6e (diff) | |
| parent | 0a24b3afc093e16038da170458e2ecb68b363bdd (diff) | |
| download | rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.tar.gz rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.tar.xz rsyslog-ec339c909734759e957065d00848abfcdfdfaf8f.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
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 2d621e0e..e3d11805 100644 --- a/tools/ompipe.c +++ b/tools/ompipe.c @@ -41,6 +41,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; } } |