[ulogd2] DB plugin: add capability to specify complete INSERT command

[Eric Leblond]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ulogd2.git;a=commit;h=49122eee73d381cb24539e0b81092bf8a4b1870d
commit 49122eee73d381cb24539e0b81092bf8a4b1870d
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Thu Apr 16 10:21:49 2009 +0200
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Fri Apr 17 07:38:59 2009 +0200

    DB plugin: add capability to specify complete INSERT command
    
    This patch modifies the procedure name parsing to be able to specify a
    complete INSERT command.

commit a03ac74abde5fb2236d9d9aa57a3ba10f8e7bdc4
Author:     Pierre Chifflier <chifflier at inl.fr>
AuthorDate: Thu Apr 16 14:20:40 2009 +0200
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Fri Apr 17 07:38:37 2009 +0200

    ulogd: configure all plugins before resolving keys.
    
    Split the 'resolve keys' step in two parts: first call the configure
    fonction for all plugins (in reverse order), then loop again
    to resolve the keys.
    This allows dynamic construction of the input and output keys, even
    for filter plugins.
    
    Signed-off-by: Pierre Chifflier <chifflier at inl.fr>

commit 0ff525cb0506b2c043bc9df6d7e7b486c865bc38
Author:     Eric Leblond <eric at inl.fr>
AuthorDate: Sun Apr 5 12:34:31 2009 +0200
Commit:     Eric Leblond <eric at inl.fr>
CommitDate: Sun Apr 5 12:34:31 2009 +0200

    ulogd: permit compilation of plugin outside of tree
    
    This patch modifies Makefile.am to install the headers needed for
    compilation of plugins outside of the source tree.
       via  49122eee73d381cb24539e0b81092bf8a4b1870d (commit)
       via  a03ac74abde5fb2236d9d9aa57a3ba10f8e7bdc4 (commit)
       via  0ff525cb0506b2c043bc9df6d7e7b486c865bc38 (commit)
      from  2d92db0597ce4291f38606fd2789876034fab12f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 49122eee73d381cb24539e0b81092bf8a4b1870d
Author: Eric Leblond <eric at inl.fr>
Date:   Thu Apr 16 10:21:49 2009 +0200

    DB plugin: add capability to specify complete INSERT command
    
    This patch modifies the procedure name parsing to be able to specify a
    complete INSERT command.

commit a03ac74abde5fb2236d9d9aa57a3ba10f8e7bdc4
Author: Pierre Chifflier <chifflier at inl.fr>
Date:   Thu Apr 16 14:20:40 2009 +0200

    ulogd: configure all plugins before resolving keys.
    
    Split the 'resolve keys' step in two parts: first call the configure
    fonction for all plugins (in reverse order), then loop again
    to resolve the keys.
    This allows dynamic construction of the input and output keys, even
    for filter plugins.
    
    Signed-off-by: Pierre Chifflier <chifflier at inl.fr>

commit 0ff525cb0506b2c043bc9df6d7e7b486c865bc38
Author: Eric Leblond <eric at inl.fr>
Date:   Sun Apr 5 12:34:31 2009 +0200

    ulogd: permit compilation of plugin outside of tree
    
    This patch modifies Makefile.am to install the headers needed for
    compilation of plugins outside of the source tree.

-----------------------------------------------------------------------

 include/Makefile.am       |    1 +
 include/ulogd/Makefile.am |    3 +--
 include/ulogd/ulogd.h     |    2 ++
 src/ulogd.c               |   20 +++++++++++++-------
 util/db.c                 |   11 ++++++++---
 5 files changed, 25 insertions(+), 12 deletions(-)
This patch modifies Makefile.am to install the headers needed for
compilation of plugins outside of the source tree.

diff --git a/include/Makefile.am b/include/Makefile.am
index fa34473..0e0b87a 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1,2 @@
 SUBDIRS = ulogd libipulog
+nobase_include_HEADERS = ulogd/conffile.h ulogd/ipfix_protocol.h ulogd/linuxlist.h ulogd/ulogd.h ulogd/common.h ulogd/linux_rbtree.h ulogd/timer.h ulogd/slist.h ulogd/hash.h ulogd/jhash.h
diff --git a/include/ulogd/Makefile.am b/include/ulogd/Makefile.am
index 9b8a3d1..de9c8f2 100644
--- a/include/ulogd/Makefile.am
+++ b/include/ulogd/Makefile.am
@@ -1,2 +1 @@
-
-noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h ulogd.h printpkt.h printflow.h common.h linux_rbtree.h timer.h slist.h hash.h jhash.h
+noinst_HEADERS = db.h printpkt.h printflow.h
diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h
index 2d1b348..3069454 100644
--- a/include/ulogd/ulogd.h
+++ b/include/ulogd/ulogd.h
@@ -19,7 +19,9 @@
 #include <signal.h>	/* need this because of extension-sighandler */
 #include <sys/types.h>
 #include <string.h>
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))