Imported Upstream version 5.7.8upstream/5.7.8

14 files changed, 18 insertions, 0 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index ea6c8f2..d803c54 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -261,6 +261,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+have_valgrind = @have_valgrind@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/omdiscard.c b/tools/omdiscard.c
index 227ad8e..dbd1809 100644
--- a/tools/omdiscard.c
+++ b/tools/omdiscard.c
@@ -38,6 +38,7 @@
 #include "module-template.h"
 
 MODULE_TYPE_OUTPUT
+MODULE_TYPE_NOKEEP
 
 /* internal structures
  */
diff --git a/tools/omfile.c b/tools/omfile.c
index 8c507a5..08f965b 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -70,6 +70,7 @@
 #include "atomic.h"
 
 MODULE_TYPE_OUTPUT
+MODULE_TYPE_NOKEEP
 
 /* internal structures
  */
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 487bb35..38a4a16 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -64,6 +64,7 @@
 #include "errmsg.h"
 
 MODULE_TYPE_OUTPUT
+MODULE_TYPE_NOKEEP
 
 /* internal structures
  */
diff --git a/tools/ompipe.c b/tools/ompipe.c
index c51a5c4..58725fb 100644
--- a/tools/ompipe.c
+++ b/tools/ompipe.c
@@ -57,6 +57,7 @@
 #include "errmsg.h"
 
 MODULE_TYPE_OUTPUT
+MODULE_TYPE_NOKEEP
 
 /* internal structures
  */
diff --git a/tools/omshell.c b/tools/omshell.c
index f8a6852..25f9838 100644
--- a/tools/omshell.c
+++ b/tools/omshell.c
@@ -46,6 +46,7 @@
 #include "errmsg.h"
 
 MODULE_TYPE_OUTPUT
+MODULE_TYPE_NOKEEP
 
 /* internal structures
  */
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index 768baca..2d99c1e 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -87,6 +87,7 @@
 
 
 MODULE_TYPE_OUTPUT
+MODULE_TYPE_NOKEEP
 
 /* internal structures
  */
diff --git a/tools/pmrfc3164.c b/tools/pmrfc3164.c
index 38f556a..635ca98 100644
--- a/tools/pmrfc3164.c
+++ b/tools/pmrfc3164.c
@@ -45,6 +45,7 @@
 #include "unicode-helper.h"
 
 MODULE_TYPE_PARSER
+MODULE_TYPE_NOKEEP
 PARSER_NAME("rsyslog.rfc3164")
 
 /* internal structures
diff --git a/tools/pmrfc5424.c b/tools/pmrfc5424.c
index 07994ad..2bd1804 100644
--- a/tools/pmrfc5424.c
+++ b/tools/pmrfc5424.c
@@ -44,6 +44,7 @@
 #include "unicode-helper.h"
 
 MODULE_TYPE_PARSER
+MODULE_TYPE_NOKEEP
 PARSER_NAME("rsyslog.rfc5424")
 
 /* internal structures
diff --git a/tools/smfile.c b/tools/smfile.c
index 5e4a775..1e0bf09 100644
--- a/tools/smfile.c
+++ b/tools/smfile.c
@@ -46,6 +46,7 @@
 #include "unicode-helper.h"
 
 MODULE_TYPE_STRGEN
+MODULE_TYPE_NOKEEP
 STRGEN_NAME("RSYSLOG_FileFormat")
 
 /* internal structures
diff --git a/tools/smfwd.c b/tools/smfwd.c
index fe33fb2..60fe94a 100644
--- a/tools/smfwd.c
+++ b/tools/smfwd.c
@@ -43,6 +43,7 @@
 #include "unicode-helper.h"
 
 MODULE_TYPE_STRGEN
+MODULE_TYPE_NOKEEP
 STRGEN_NAME("RSYSLOG_ForwardFormat")
 
 /* internal structures
diff --git a/tools/smtradfile.c b/tools/smtradfile.c
index eff2f99..5484f7b 100644
--- a/tools/smtradfile.c
+++ b/tools/smtradfile.c
@@ -43,6 +43,7 @@
 #include "unicode-helper.h"
 
 MODULE_TYPE_STRGEN
+MODULE_TYPE_NOKEEP
 STRGEN_NAME("RSYSLOG_TraditionalFileFormat")
 
 /* internal structures
diff --git a/tools/smtradfwd.c b/tools/smtradfwd.c
index 88dc608..3771743 100644
--- a/tools/smtradfwd.c
+++ b/tools/smtradfwd.c
@@ -43,6 +43,7 @@
 #include "unicode-helper.h"
 
 MODULE_TYPE_STRGEN
+MODULE_TYPE_NOKEEP
 STRGEN_NAME("RSYSLOG_TraditionalForwardFormat")
 
 /* internal structures
diff --git a/tools/syslogd.c b/tools/syslogd.c
index f7d71d0..dbbdbfe 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1333,6 +1333,11 @@ generateConfigDAG(uchar *pszDAGFile)
 	DEFiRet;
 
 	assert(pszDAGFile != NULL);
+	
+	logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)
+		"Configuration graph generation is unfortunately disabled "
+		"in the current code base.", 0);
+	ABORT_FINALIZE(RS_RET_FILENAME_INVALID);
 
 	if((fp = fopen((char*) pszDAGFile, "w")) == NULL) {
 		logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)