From e1c34e174139ad030ca1108ff9782b294909013c Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 19 Apr 2011 07:53:23 +0200
Subject: renamed conf.c to legacyconf.c to make room for new config system

---
 tools/omfile.c     | 2 +-
 tools/omfwd.c      | 2 +-
 tools/ompipe.c     | 2 +-
 tools/omshell.c    | 2 +-
 tools/omusrmsg.c   | 2 +-
 tools/pmrfc3164.c  | 2 +-
 tools/pmrfc5424.c  | 2 +-
 tools/smfile.c     | 2 +-
 tools/smfwd.c      | 2 +-
 tools/smtradfile.c | 2 +-
 tools/smtradfwd.c  | 2 +-
 tools/syslogd.c    | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tools')

diff --git a/tools/omfile.c b/tools/omfile.c
index 8526cb74..5fc87330 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 be13bf75..3004b082 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 01695369..db4de73b 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 0e4e0f24..046fb41d 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 da510e08..e5477a1c 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 635ca985..3876ca0b 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 b06f1347..d39ec8e5 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 1e0bf091..c8f66120 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 60fe94a7..3f9a3a84 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 5484f7be..e57d2937 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 37717434..be3982d7 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 44c88624..a6127305 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"
-- 
cgit