Merge branch 'v5-beta'

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh

13 files changed, 17 insertions, 0 deletions

diff --git a/tools/omdiscard.c b/tools/omdiscard.c
index 4b8ab822..9d069ea6 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 435424a9..8526cb74 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -70,6 +70,7 @@
 #include "atomic.h"
 
 MODULE_TYPE_OUTPUT
+MODULE_TYPE_NOKEEP
 
 /* forward definitions */
 static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal);
diff --git a/tools/omfwd.c b/tools/omfwd.c
index fb9c9217..7e2b7f89 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 967a2841..01695369 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 45934bca..0e4e0f24 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 c5a28a09..da510e08 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 38f556a2..635ca985 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 07994ade..2bd18042 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 5e4a775f..1e0bf091 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 fe33fb2c..60fe94a7 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 eff2f99a..5484f7be 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 88dc6082..37717434 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 73995e68..fb2f1f21 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1330,6 +1330,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*)