summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/mmnormalize/mmnormalize.c2
-rw-r--r--plugins/omdbalerting/omdbalerting.c2
-rw-r--r--plugins/omgssapi/omgssapi.c2
-rw-r--r--plugins/omhdfs/omhdfs.c2
-rw-r--r--plugins/ommail/ommail.c2
-rw-r--r--plugins/ommongodb/ommongodb.c4
-rw-r--r--plugins/ommysql/ommysql.c2
-rw-r--r--plugins/ompgsql/ompgsql.c2
-rw-r--r--plugins/omprog/omprog.c2
-rw-r--r--plugins/omrelp/omrelp.c2
-rw-r--r--plugins/omruleset/omruleset.c2
-rw-r--r--plugins/omsnmp/omsnmp.c2
-rw-r--r--plugins/omstdout/omstdout.c2
-rw-r--r--plugins/omtemplate/omtemplate.c2
-rw-r--r--plugins/omtesting/omtesting.c2
-rw-r--r--plugins/omudpspoof/omudpspoof.c2
-rw-r--r--plugins/omuxsock/omuxsock.c2
-rw-r--r--plugins/pmaixforwardedfrom/pmaixforwardedfrom.c2
-rw-r--r--plugins/pmcisconames/pmcisconames.c2
-rw-r--r--plugins/pmlastmsg/pmlastmsg.c2
-rw-r--r--plugins/pmrfc3164sd/pmrfc3164sd.c2
-rw-r--r--plugins/pmsnare/pmsnare.c2
-rw-r--r--plugins/sm_cust_bindcdr/sm_cust_bindcdr.c2
-rw-r--r--runtime/Makefile.am4
-rw-r--r--runtime/cfsysline.c2
-rw-r--r--runtime/legacyconf.c (renamed from runtime/conf.c)4
-rw-r--r--runtime/legacyconf.h (renamed from runtime/conf.h)2
-rw-r--r--runtime/rsyslog.c2
-rw-r--r--runtime/strmsrv.c2
-rw-r--r--tcpsrv.c2
-rw-r--r--tools/omfile.c2
-rw-r--r--tools/omfwd.c2
-rw-r--r--tools/ompipe.c2
-rw-r--r--tools/omshell.c2
-rw-r--r--tools/omusrmsg.c2
-rw-r--r--tools/pmrfc3164.c2
-rw-r--r--tools/pmrfc5424.c2
-rw-r--r--tools/smfile.c2
-rw-r--r--tools/smfwd.c2
-rw-r--r--tools/smtradfile.c2
-rw-r--r--tools/smtradfwd.c2
-rw-r--r--tools/syslogd.c2
42 files changed, 45 insertions, 45 deletions
diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
index 9c23afd..9517ec0 100644
--- a/plugins/mmnormalize/mmnormalize.c
+++ b/plugins/mmnormalize/mmnormalize.c
@@ -38,7 +38,7 @@
#include <libestr.h>
#include <libee/libee.h>
#include <liblognorm.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "module-template.h"
diff --git a/plugins/omdbalerting/omdbalerting.c b/plugins/omdbalerting/omdbalerting.c
index 35de581..55e8c37 100644
--- a/plugins/omdbalerting/omdbalerting.c
+++ b/plugins/omdbalerting/omdbalerting.c
@@ -35,7 +35,7 @@
#include <signal.h>
#include <errno.h>
#include <unistd.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "template.h"
diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c
index 6b75540..1dc9679 100644
--- a/plugins/omgssapi/omgssapi.c
+++ b/plugins/omgssapi/omgssapi.c
@@ -44,7 +44,7 @@
#include <pthread.h>
#include <gssapi/gssapi.h>
#include "dirty.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "net.h"
diff --git a/plugins/omhdfs/omhdfs.c b/plugins/omhdfs/omhdfs.c
index 48168f2..efd3b67 100644
--- a/plugins/omhdfs/omhdfs.c
+++ b/plugins/omhdfs/omhdfs.c
@@ -41,7 +41,7 @@
#include "syslogd-types.h"
#include "srUtils.h"
#include "template.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "cfsysline.h"
#include "module-template.h"
#include "unicode-helper.h"
diff --git a/plugins/ommail/ommail.c b/plugins/ommail/ommail.c
index 6468dcf..fbf6bfa 100644
--- a/plugins/ommail/ommail.c
+++ b/plugins/ommail/ommail.c
@@ -44,7 +44,7 @@
#include <netdb.h>
#include <time.h>
#include <sys/socket.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "cfsysline.h"
diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c
index 8e19105..3b7e920 100644
--- a/plugins/ommongodb/ommongodb.c
+++ b/plugins/ommongodb/ommongodb.c
@@ -10,7 +10,7 @@
#include "mongo.h"
#include "config.h"
#include "rsyslog.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "template.h"
@@ -277,4 +277,4 @@ CODEmodInit_QueryRegCFSLineHdlr
INITChkCoreFeature(bCoreSupportsBatching, CORE_FEATURE_BATCHING);
DBGPRINTF("ompgsql: module compiled with rsyslog version %s.\n", VERSION);
DBGPRINTF("ompgsql: %susing transactional output interface.\n", bCoreSupportsBatching ? "" : "not ");
-ENDmodInit \ No newline at end of file
+ENDmodInit
diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c
index 978f351..9012076 100644
--- a/plugins/ommysql/ommysql.c
+++ b/plugins/ommysql/ommysql.c
@@ -36,7 +36,7 @@
#include <errno.h>
#include <time.h>
#include <mysql.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "template.h"
diff --git a/plugins/ompgsql/ompgsql.c b/plugins/ompgsql/ompgsql.c
index df9cc3f..373bfb6 100644
--- a/plugins/ompgsql/ompgsql.c
+++ b/plugins/ompgsql/ompgsql.c
@@ -40,7 +40,7 @@
#include <errno.h>
#include <time.h>
#include <libpq-fe.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "template.h"
diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c
index 8109825..05cb080 100644
--- a/plugins/omprog/omprog.c
+++ b/plugins/omprog/omprog.c
@@ -36,7 +36,7 @@
#include <errno.h>
#include <unistd.h>
#include <wait.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "template.h"
diff --git a/plugins/omrelp/omrelp.c b/plugins/omrelp/omrelp.c
index 26e8ccd..4e8f541 100644
--- a/plugins/omrelp/omrelp.c
+++ b/plugins/omrelp/omrelp.c
@@ -36,7 +36,7 @@
#include <errno.h>
#include <ctype.h>
#include <librelp.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "cfsysline.h"
diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c
index 365b405..e41b844 100644
--- a/plugins/omruleset/omruleset.c
+++ b/plugins/omruleset/omruleset.c
@@ -39,7 +39,7 @@
#include <signal.h>
#include <errno.h>
#include <unistd.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "module-template.h"
diff --git a/plugins/omsnmp/omsnmp.c b/plugins/omsnmp/omsnmp.c
index 777a807..4b928c0 100644
--- a/plugins/omsnmp/omsnmp.c
+++ b/plugins/omsnmp/omsnmp.c
@@ -36,7 +36,7 @@
#include <netdb.h>
#include <ctype.h>
#include <assert.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "cfsysline.h"
#include "module-template.h"
diff --git a/plugins/omstdout/omstdout.c b/plugins/omstdout/omstdout.c
index f57cbe5..55d25fe 100644
--- a/plugins/omstdout/omstdout.c
+++ b/plugins/omstdout/omstdout.c
@@ -35,7 +35,7 @@
#include <signal.h>
#include <errno.h>
#include <unistd.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "template.h"
diff --git a/plugins/omtemplate/omtemplate.c b/plugins/omtemplate/omtemplate.c
index 238ec0a..c6dd954 100644
--- a/plugins/omtemplate/omtemplate.c
+++ b/plugins/omtemplate/omtemplate.c
@@ -36,7 +36,7 @@
#include <signal.h>
#include <errno.h>
#include <time.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "template.h"
diff --git a/plugins/omtesting/omtesting.c b/plugins/omtesting/omtesting.c
index 414ecfc..1598707 100644
--- a/plugins/omtesting/omtesting.c
+++ b/plugins/omtesting/omtesting.c
@@ -53,7 +53,7 @@
#include "dirty.h"
#include "syslogd-types.h"
#include "module-template.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "cfsysline.h"
MODULE_TYPE_OUTPUT
diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c
index 217de1c..19e0b70 100644
--- a/plugins/omudpspoof/omudpspoof.c
+++ b/plugins/omudpspoof/omudpspoof.c
@@ -60,7 +60,7 @@
#ifdef USE_NETZIP
#include <zlib.h>
#endif
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "net.h"
diff --git a/plugins/omuxsock/omuxsock.c b/plugins/omuxsock/omuxsock.c
index ea1c801..8b9ec80 100644
--- a/plugins/omuxsock/omuxsock.c
+++ b/plugins/omuxsock/omuxsock.c
@@ -41,7 +41,7 @@
#include <assert.h>
#include <errno.h>
#include <unistd.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "srUtils.h"
#include "template.h"
#include "msg.h"
diff --git a/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c b/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c
index fa4a908..12c52ff 100644
--- a/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c
+++ b/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c
@@ -29,7 +29,7 @@
#include <string.h>
#include <assert.h>
#include <ctype.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/plugins/pmcisconames/pmcisconames.c b/plugins/pmcisconames/pmcisconames.c
index 61688cb..bf79e95 100644
--- a/plugins/pmcisconames/pmcisconames.c
+++ b/plugins/pmcisconames/pmcisconames.c
@@ -29,7 +29,7 @@
#include <string.h>
#include <assert.h>
#include <ctype.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/plugins/pmlastmsg/pmlastmsg.c b/plugins/pmlastmsg/pmlastmsg.c
index 259c5d4..118c433 100644
--- a/plugins/pmlastmsg/pmlastmsg.c
+++ b/plugins/pmlastmsg/pmlastmsg.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <assert.h>
#include <ctype.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/plugins/pmrfc3164sd/pmrfc3164sd.c b/plugins/pmrfc3164sd/pmrfc3164sd.c
index 53204ec..4ddd98b 100644
--- a/plugins/pmrfc3164sd/pmrfc3164sd.c
+++ b/plugins/pmrfc3164sd/pmrfc3164sd.c
@@ -33,7 +33,7 @@
#include <errno.h>
#include <ctype.h>
#include "syslogd.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/plugins/pmsnare/pmsnare.c b/plugins/pmsnare/pmsnare.c
index f3658d1..757e6a8 100644
--- a/plugins/pmsnare/pmsnare.c
+++ b/plugins/pmsnare/pmsnare.c
@@ -46,7 +46,7 @@
#include <string.h>
#include <assert.h>
#include <ctype.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c b/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c
index 0fa1a4c..b55cec4 100644
--- a/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c
+++ b/plugins/sm_cust_bindcdr/sm_cust_bindcdr.c
@@ -41,7 +41,7 @@
#include <string.h>
#include <assert.h>
#include <errno.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "cfsysline.h"
#include "template.h"
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index c8e8ce2..a963251 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -18,8 +18,8 @@ librsyslog_la_SOURCES = \
glbl.h \
glbl.c \
unlimited_select.h \
- conf.c \
- conf.h \
+ legacyconf.c \
+ legacyconf.h \
parser.h \
parser.c \
strgen.h \
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c
index 97b35bb..44b2602 100644
--- a/runtime/cfsysline.c
+++ b/runtime/cfsysline.c
@@ -39,7 +39,7 @@
#include "cfsysline.h"
#include "obj.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "errmsg.h"
#include "srUtils.h"
#include "unicode-helper.h"
diff --git a/runtime/conf.c b/runtime/legacyconf.c
index 1d28a88..fd23bdc 100644
--- a/runtime/conf.c
+++ b/runtime/legacyconf.c
@@ -1,4 +1,4 @@
-/* The config file handler (not yet a real object)
+/* The legacy config file handler (not yet a real object)
*
* This file is based on an excerpt from syslogd.c, which dates back
* much later. I began the file on 2008-02-19 as part of the modularization
@@ -60,7 +60,7 @@
#include "modules.h"
#include "outchannel.h"
#include "stringbuf.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "stringbuf.h"
#include "srUtils.h"
#include "errmsg.h"
diff --git a/runtime/conf.h b/runtime/legacyconf.h
index bc09d50..2cfd540 100644
--- a/runtime/conf.h
+++ b/runtime/legacyconf.h
@@ -1,4 +1,4 @@
-/* Definitions for config file handling (not yet an object).
+/* Definitions for the legacy config file handling (not yet an object).
*
* Copyright 2008 Rainer Gerhards and Adiscon GmbH.
*
diff --git a/runtime/rsyslog.c b/runtime/rsyslog.c
index bdb1c9f..9cf32f2 100644
--- a/runtime/rsyslog.c
+++ b/runtime/rsyslog.c
@@ -74,7 +74,7 @@
#include "vmprg.h"
#include "datetime.h"
#include "queue.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "glbl.h"
#include "errmsg.h"
#include "prop.h"
diff --git a/runtime/strmsrv.c b/runtime/strmsrv.c
index e66ad71..4de58b7 100644
--- a/runtime/strmsrv.c
+++ b/runtime/strmsrv.c
@@ -64,7 +64,7 @@
#include "module-template.h"
#include "net.h"
#include "srUtils.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "strmsrv.h"
#include "obj.h"
#include "glbl.h"
diff --git a/tcpsrv.c b/tcpsrv.c
index 39cba5d..a7a5e3f 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -59,7 +59,7 @@
#include "module-template.h"
#include "net.h"
#include "srUtils.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "tcpsrv.h"
#include "obj.h"
#include "glbl.h"
diff --git a/tools/omfile.c b/tools/omfile.c
index 8526cb7..5fc8733 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -56,7 +56,7 @@
#endif
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "template.h"
diff --git a/tools/omfwd.c b/tools/omfwd.c
index be13bf7..3004b08 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -48,7 +48,7 @@
#endif
#include <pthread.h>
#include "syslogd.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "net.h"
diff --git a/tools/ompipe.c b/tools/ompipe.c
index 0169536..db4de73 100644
--- a/tools/ompipe.c
+++ b/tools/ompipe.c
@@ -53,7 +53,7 @@
#include "omfile.h" /* for dirty trick: access to $ActionFileDefaultTemplate value */
#include "cfsysline.h"
#include "module-template.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "errmsg.h"
MODULE_TYPE_OUTPUT
diff --git a/tools/omshell.c b/tools/omshell.c
index 0e4e0f2..046fb41 100644
--- a/tools/omshell.c
+++ b/tools/omshell.c
@@ -38,7 +38,7 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "omshell.h"
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index da510e0..e5477a1 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -74,7 +74,7 @@
#include "srUtils.h"
#include "stringbuf.h"
#include "syslogd-types.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "omusrmsg.h"
#include "module-template.h"
#include "errmsg.h"
diff --git a/tools/pmrfc3164.c b/tools/pmrfc3164.c
index 635ca98..3876ca0 100644
--- a/tools/pmrfc3164.c
+++ b/tools/pmrfc3164.c
@@ -33,7 +33,7 @@
#include <errno.h>
#include <ctype.h>
#include "syslogd.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/tools/pmrfc5424.c b/tools/pmrfc5424.c
index b06f134..d39ec8e 100644
--- a/tools/pmrfc5424.c
+++ b/tools/pmrfc5424.c
@@ -32,7 +32,7 @@
#include <assert.h>
#include <errno.h>
#include "syslogd.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/tools/smfile.c b/tools/smfile.c
index 1e0bf09..c8f6612 100644
--- a/tools/smfile.c
+++ b/tools/smfile.c
@@ -38,7 +38,7 @@
#include <assert.h>
#include <errno.h>
#include "syslogd.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/tools/smfwd.c b/tools/smfwd.c
index 60fe94a..3f9a3a8 100644
--- a/tools/smfwd.c
+++ b/tools/smfwd.c
@@ -35,7 +35,7 @@
#include <assert.h>
#include <errno.h>
#include "syslogd.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/tools/smtradfile.c b/tools/smtradfile.c
index 5484f7b..e57d293 100644
--- a/tools/smtradfile.c
+++ b/tools/smtradfile.c
@@ -35,7 +35,7 @@
#include <assert.h>
#include <errno.h>
#include "syslogd.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/tools/smtradfwd.c b/tools/smtradfwd.c
index 3771743..be3982d 100644
--- a/tools/smtradfwd.c
+++ b/tools/smtradfwd.c
@@ -35,7 +35,7 @@
#include <assert.h>
#include <errno.h>
#include "syslogd.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "syslogd-types.h"
#include "template.h"
#include "msg.h"
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 44c8862..a612730 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -124,7 +124,7 @@
#include "wti.h"
#include "queue.h"
#include "stream.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "errmsg.h"
#include "datetime.h"
#include "parser.h"