summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-01 14:21:49 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-01 14:21:49 +0100
commitabef390dae4e959a0650a1f8ff747dc5d1528305 (patch)
tree744badfb1d749ad241691781576a122276896dca /tools/syslogd.c
parentebf058226120b89bc2735ff72c4c12c14cfa2599 (diff)
parentb4cdb7c997eee95df96321d11d03cf90e4a6caba (diff)
downloadrsyslog-abef390dae4e959a0650a1f8ff747dc5d1528305.tar.gz
rsyslog-abef390dae4e959a0650a1f8ff747dc5d1528305.tar.xz
rsyslog-abef390dae4e959a0650a1f8ff747dc5d1528305.zip
Merge branch 'beta' into master
Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r--tools/syslogd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index d0261a1d..1ba3ef2b 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -124,6 +124,7 @@
#include "omusrmsg.h"
#include "omfwd.h"
#include "omfile.h"
+#include "ompipe.h"
#include "omdiscard.h"
#include "pmrfc5424.h"
#include "pmrfc3164.h"
@@ -1959,6 +1960,9 @@ static rsRetVal loadBuildInModules(void)
if((iRet = module.doModInit(modInitFile, UCHAR_CONSTANT("builtin-file"), NULL)) != RS_RET_OK) {
RETiRet;
}
+ if((iRet = module.doModInit(modInitPipe, UCHAR_CONSTANT("builtin-pipe"), NULL)) != RS_RET_OK) {
+ RETiRet;
+ }
#ifdef SYSLOG_INET
if((iRet = module.doModInit(modInitFwd, UCHAR_CONSTANT("builtin-fwd"), NULL)) != RS_RET_OK) {
RETiRet;