renaming conf.* wasn't a good idea -- undoing

too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".

23 files changed, 24 insertions, 24 deletions

diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
index 9517ec09..9c23afde 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 "legacyconf.h"
+#include "conf.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 55e8c375..35de5818 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "template.h"
diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c
index 1dc96794..6b75540f 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "net.h"
diff --git a/plugins/omhdfs/omhdfs.c b/plugins/omhdfs/omhdfs.c
index efd3b672..48168f28 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 "legacyconf.h"
+#include "conf.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 fbf6bfad..6468dcf2 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "cfsysline.h"
diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c
index 3b7e9209..8e19105f 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 "legacyconf.h"
+#include "conf.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
+ENDmodInit
\ No newline at end of file
diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c
index 90120768..978f3517 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "template.h"
diff --git a/plugins/ompgsql/ompgsql.c b/plugins/ompgsql/ompgsql.c
index 373bfb6d..df9cc3fe 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "template.h"
diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c
index 05cb0803..81098257 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "template.h"
diff --git a/plugins/omrelp/omrelp.c b/plugins/omrelp/omrelp.c
index 4e8f5419..26e8ccd3 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "cfsysline.h"
diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c
index e41b8445..365b405d 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 "legacyconf.h"
+#include "conf.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 4b928c03..777a8074 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 "legacyconf.h"
+#include "conf.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 55d25fe5..f57cbe57 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "template.h"
diff --git a/plugins/omtemplate/omtemplate.c b/plugins/omtemplate/omtemplate.c
index c6dd9546..238ec0ae 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "template.h"
diff --git a/plugins/omtesting/omtesting.c b/plugins/omtesting/omtesting.c
index 15987077..414ecfc5 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 "legacyconf.h"
+#include "conf.h"
 #include "cfsysline.h"
 
 MODULE_TYPE_OUTPUT
diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c
index 19e0b70a..217de1c8 100644
--- a/plugins/omudpspoof/omudpspoof.c
+++ b/plugins/omudpspoof/omudpspoof.c
@@ -60,7 +60,7 @@
 #ifdef USE_NETZIP
 #include <zlib.h>
 #endif
-#include "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "net.h"
diff --git a/plugins/omuxsock/omuxsock.c b/plugins/omuxsock/omuxsock.c
index 8b9ec800..ea1c8014 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 "legacyconf.h"
+#include "conf.h"
 #include "srUtils.h"
 #include "template.h"
 #include "msg.h"
diff --git a/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c b/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c
index 12c52ff9..fa4a9087 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "template.h"
 #include "msg.h"
diff --git a/plugins/pmcisconames/pmcisconames.c b/plugins/pmcisconames/pmcisconames.c
index bf79e957..61688cbf 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "template.h"
 #include "msg.h"
diff --git a/plugins/pmlastmsg/pmlastmsg.c b/plugins/pmlastmsg/pmlastmsg.c
index 118c4331..259c5d41 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "template.h"
 #include "msg.h"
diff --git a/plugins/pmrfc3164sd/pmrfc3164sd.c b/plugins/pmrfc3164sd/pmrfc3164sd.c
index 4ddd98bc..53204ece 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "template.h"
 #include "msg.h"
diff --git a/plugins/pmsnare/pmsnare.c b/plugins/pmsnare/pmsnare.c
index 757e6a8f..f3658d11 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 "legacyconf.h"
+#include "conf.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 b55cec48..0fa1a4c4 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 "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "cfsysline.h"
 #include "template.h"