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".

12 files changed, 12 insertions, 12 deletions

diff --git a/tools/omfile.c b/tools/omfile.c
index 5fc87330..8526cb74 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -56,7 +56,7 @@
 #endif
 
 
-#include "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "template.h"
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 3004b082..be13bf75 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -48,7 +48,7 @@
 #endif
 #include <pthread.h>
 #include "syslogd.h"
-#include "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "net.h"
diff --git a/tools/ompipe.c b/tools/ompipe.c
index db4de73b..01695369 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 "legacyconf.h"
+#include "conf.h"
 #include "errmsg.h"
 
 MODULE_TYPE_OUTPUT
diff --git a/tools/omshell.c b/tools/omshell.c
index 046fb41d..0e4e0f24 100644
--- a/tools/omshell.c
+++ b/tools/omshell.c
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "srUtils.h"
 #include "omshell.h"
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index e5477a1c..da510e08 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -74,7 +74,7 @@
 #include "srUtils.h"
 #include "stringbuf.h"
 #include "syslogd-types.h"
-#include "legacyconf.h"
+#include "conf.h"
 #include "omusrmsg.h"
 #include "module-template.h"
 #include "errmsg.h"
diff --git a/tools/pmrfc3164.c b/tools/pmrfc3164.c
index 3876ca0b..635ca985 100644
--- a/tools/pmrfc3164.c
+++ b/tools/pmrfc3164.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/tools/pmrfc5424.c b/tools/pmrfc5424.c
index d39ec8e5..b06f1347 100644
--- a/tools/pmrfc5424.c
+++ b/tools/pmrfc5424.c
@@ -32,7 +32,7 @@
 #include <assert.h>
 #include <errno.h>
 #include "syslogd.h"
-#include "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "template.h"
 #include "msg.h"
diff --git a/tools/smfile.c b/tools/smfile.c
index c8f66120..1e0bf091 100644
--- a/tools/smfile.c
+++ b/tools/smfile.c
@@ -38,7 +38,7 @@
 #include <assert.h>
 #include <errno.h>
 #include "syslogd.h"
-#include "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "template.h"
 #include "msg.h"
diff --git a/tools/smfwd.c b/tools/smfwd.c
index 3f9a3a84..60fe94a7 100644
--- a/tools/smfwd.c
+++ b/tools/smfwd.c
@@ -35,7 +35,7 @@
 #include <assert.h>
 #include <errno.h>
 #include "syslogd.h"
-#include "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "template.h"
 #include "msg.h"
diff --git a/tools/smtradfile.c b/tools/smtradfile.c
index e57d2937..5484f7be 100644
--- a/tools/smtradfile.c
+++ b/tools/smtradfile.c
@@ -35,7 +35,7 @@
 #include <assert.h>
 #include <errno.h>
 #include "syslogd.h"
-#include "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "template.h"
 #include "msg.h"
diff --git a/tools/smtradfwd.c b/tools/smtradfwd.c
index be3982d7..37717434 100644
--- a/tools/smtradfwd.c
+++ b/tools/smtradfwd.c
@@ -35,7 +35,7 @@
 #include <assert.h>
 #include <errno.h>
 #include "syslogd.h"
-#include "legacyconf.h"
+#include "conf.h"
 #include "syslogd-types.h"
 #include "template.h"
 #include "msg.h"
diff --git a/tools/syslogd.c b/tools/syslogd.c
index a6127305..44c88624 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -124,7 +124,7 @@
 #include "wti.h"
 #include "queue.h"
 #include "stream.h"
-#include "legacyconf.h"
+#include "conf.h"
 #include "errmsg.h"
 #include "datetime.h"
 #include "parser.h"