harmonize log file defaults with ulogd.conf

Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>

diff --git a/doc/ulogd.sgml b/doc/ulogd.sgml
index 65a63cf58802062f871cfa9b82ee50dfff4ee174..de799f4d0bb8c3cf55e62a7826e8fea6671d2bff 100644 (file)
--- a/doc/ulogd.sgml
+++ b/doc/ulogd.sgml
@@ -422,7 +422,7 @@ to a file.  The only useful application is debugging.
 <descrip>
 <tag>dumpfile</tag>
 The filename where it should log to. The default is
-<tt>/var/log/ulogd.pktlog</tt>
+<tt>/var/log/ulogd_oprint.log</tt>
 </descrip>
 
 <sect2>ulogd_output_LOGEMU.so
@@ -433,7 +433,7 @@ as possible. Logging is done to a seperate textfile instead of syslog, though.
 The module defines the following configuration directives:
 <descrip>
 <tag>file</tag>The filename where it should log to. The default is
-<tt>/var/log/ulogd.syslogemu</tt>
+<tt>/var/log/ulogd_syslogemu.log</tt>
 <tag>sync</tag>Set this to 1 if you want to have your logfile written
 synchronously. This may reduce performance, but makes your log-lines appear
 immediately.  The default is <tt>0</tt>

diff --git a/output/ulogd_output_GPRINT.c b/output/ulogd_output_GPRINT.c
index 4f49c34af27d028260dc548c5a9a9b4364ac5a7c..bc7aa3419ed8978e0f64311e973e9f2f4a5cf44b 100644 (file)
--- a/output/ulogd_output_GPRINT.c
+++ b/output/ulogd_output_GPRINT.c
@@ -31,7 +31,7 @@
 #include <ulogd/conffile.h>
 
 #ifndef ULOGD_GPRINT_DEFAULT
-#define ULOGD_GPRINT_DEFAULT   "/var/log/ulogd.gprint"
+#define ULOGD_GPRINT_DEFAULT   "/var/log/ulogd_gprint.log"
 #endif
 
 struct gprint_priv {

diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c
index bb272093cc0fa5148fe863123725fa494deab89f..cfcfab734746477bb169739c70e835d51d5ca5d8 100644 (file)
--- a/output/ulogd_output_LOGEMU.c
+++ b/output/ulogd_output_LOGEMU.c
@@ -37,7 +37,7 @@
 #endif
 
 #ifndef ULOGD_LOGEMU_DEFAULT
-#define ULOGD_LOGEMU_DEFAULT   "/var/log/ulogd.syslogemu"
+#define ULOGD_LOGEMU_DEFAULT   "/var/log/ulogd_syslogemu.log"
 #endif
 
 #ifndef ULOGD_LOGEMU_SYNC_DEFAULT

diff --git a/output/ulogd_output_NACCT.c b/output/ulogd_output_NACCT.c
index 9de8a7336c8704b75c41ca7db9edb139ad408ffe..d369c7a873156390fd6351666017035bfa609f66 100644 (file)
--- a/output/ulogd_output_NACCT.c
+++ b/output/ulogd_output_NACCT.c
@@ -29,7 +29,7 @@
 #include <ulogd/ulogd.h>
 #include <ulogd/conffile.h>
 
-#define NACCT_FILE_DEFAULT     "/var/log/nacctdata.log"
+#define NACCT_FILE_DEFAULT     "/var/log/ulogd_nacct.log"
 
 /* config accessors (lazy me...) */
 #define NACCT_CFG_FILE(pi)     ((pi)->config_kset->ces[0].u.string)

diff --git a/output/ulogd_output_OPRINT.c b/output/ulogd_output_OPRINT.c
index e390c841533385c2b34d03e07152e3de3677e05b..6fde445ed1e46a2792850586d62376b41c5490d2 100644 (file)
--- a/output/ulogd_output_OPRINT.c
+++ b/output/ulogd_output_OPRINT.c
@@ -28,7 +28,7 @@
 #include <ulogd/conffile.h>
 
 #ifndef ULOGD_OPRINT_DEFAULT
-#define ULOGD_OPRINT_DEFAULT   "/var/log/ulogd.pktlog"
+#define ULOGD_OPRINT_DEFAULT   "/var/log/ulogd_oprint.log"
 #endif
 
 #define NIPQUAD(addr) \