This patch fixes so the pathes in ulogd.conf matches what you gave to

configure.. (Magnus Boden)

diff --git a/Makefile.in b/Makefile.in
index 603807629788562c4e89e1d7eed8e88e4dd56f40..9475ab58a66ee08d4716fddf24cebcca637f21fe 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,12 +31,17 @@ distrib:
 recurse: 
        @for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done
 
-ulogd: ulogd.c $(LIBIPULOG) include/ulogd/ulogd.h conffile/conffile.o $(LIBIPULOG)/libipulog.a
+ulogd: ulogd.c $(LIBIPULOG) include/ulogd/ulogd.h conffile/conffile.o $(LIBIPULOG)/libipulog.a ulogd.conf
        $(CC) $(CFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS)
 
+edit = sed -e 's,@libdir\@,$(ULOGD_LIB_PATH),g'
+
+ulogd.conf: ulogd.conf.in
+       $(edit) ulogd.conf.in > ulogd.conf
+
 clean:
 #      rm -f ulogd *.o extensions/*.o extensions/*.so conffile/*.o
-       rm -f ulogd ulogd.o
+       rm -f ulogd ulogd.o ulogd.conf
        @for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done
 
 distclean: clean

diff --git a/ulogd.conf b/ulogd.conf.in
similarity index 86%
rename from ulogd.conf
rename to ulogd.conf.in
index e06a3aef8206a8362df7db9f7fafb28061a21664..c1b3bbbf7dbbbb4a25359680d35fe73c0329f44a 100644 (file)
--- a/ulogd.conf
+++ b/ulogd.conf.in
@@ -1,5 +1,5 @@
 # Example configuration for ulogd
-# $Id: ulogd.conf,v 1.7 2002/07/30 07:04:12 laforge Exp $
+# $Id: ulogd.conf,v 1.8 2002/07/30 07:15:54 laforge Exp $
 #
 
 ######################################################################
@@ -33,7 +33,7 @@ bufsize 65535
 #
 # ulogd_BASE.so - interpreter plugin for basic IPv4 header fields
 #                you will always need this
-plugin /usr/local/lib/ulogd/ulogd_BASE.so
+plugin @libdir@/ulogd_BASE.so
 
 
 #
@@ -44,7 +44,7 @@ syslogfile /var/log/ulogd.syslogemu
 # do we want to fflush() the file after each write?
 syslogsync 1
 # load the plugin
-plugin /usr/local/lib/ulogd/ulogd_LOGEMU.so
+plugin @libdir@/ulogd_LOGEMU.so
 
 
 # 
@@ -53,7 +53,7 @@ plugin /usr/local/lib/ulogd/ulogd_LOGEMU.so
 # where to write the log
 dumpfile /var/log/ulogd.pktlog
 # load the plugin (remove the '#'if you want to enable it
-#plugin /usr/local/lib/ulogd/ulogd_OPRINT.so
+#plugin @libdir@/ulogd_OPRINT.so
 
 
 #
@@ -66,7 +66,7 @@ mysqluser laforge
 mysqldb ulogd
 mysqlhost localhost
 # load the plugin (remove the '#' if you want to enable it)
-#plugin /usr/local/lib/ulogd/ulogd_MYSQL.so
+#plugin @libdir@/ulogd_MYSQL.so
 
 
 #
@@ -79,4 +79,8 @@ pgsqluser postgres
 pgsqldb ulogd
 pgsqlhost localhost
 #load the plugin (remove the '#' if you want to enable it)
-#plugin /usr/local/lib/ulogd/ulogd_PGSQL.so
+#plugin @libdir@/ulogd_PGSQL.so
+
+pcapfile /var/log/ulogd.pcap
+pcapsync 1
+#plugin @libdir@/ulogd_PCAP.so