[ULOGD2 PATCH 0/2] Misc cleaning

[ULOGD2 PATCH 0/2] Misc cleaning

[Eric Leblond]

Hello,

This small patchset features some cleaning. The main patch is relative
to a wrong computation of a buffer size in the databases plugins.

BR,
--
Eric Leblond
INL: http://www.inl.fr/
NuFW: http://www.nufw.org/

[ULOGD2 PATCH 1/2] Suppress subversion specific dist-hook.

[Eric Leblond]

This patch suppress a dist-hook in Makefile.am which was related
to the suppression of some subversion related files.

Signed-off-by: Eric Leblond <eric@inl.fr>
---
 Makefile.am |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9f11dfb..46615c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,5 +20,3 @@ $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
-dist-hook:
-	rm -rf `find $(distdir)/debian -name .svn`
-- 
1.5.5.1

[ULOGD2 PATCH 2/2] Fix computation of allocated size for query.

[Eric Leblond]

This patch fixes the computation of the allocation size for the query.
It was not taking into account the length of the name of the procedure.

Signed-off-by: Eric Leblond <eric@inl.fr>
---
 util/db.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/util/db.c b/util/db.c
index 3cfe057..5cf5fe1 100644
--- a/util/db.c
+++ b/util/db.c
@@ -54,7 +54,7 @@ static int disabled_interp_db(struct ulogd_pluginstance *upi)
 	return 0;
 }
 
-#define SQL_INSERTTEMPL   "insert into X (Y) values (Z)"
+#define SQL_INSERTTEMPL   "SELECT P(Y)"
 #define SQL_VALSIZE	100
 
 /* create the static part of our insert statement */
@@ -80,7 +80,8 @@ static int sql_createstmt(struct ulogd_pluginstance *upi)
 		/* we need space for the key and a comma, as well as
 		 * enough space for the values */
 		size += strlen(upi->input.keys[i].name) + 1 + SQL_VALSIZE;
-	}	
+	}
+	size += srtlen(procedure);
 
 	ulogd_log(ULOGD_DEBUG, "allocating %u bytes for statement\n", size);
 
-- 
1.5.5.1

Re: [ULOGD2 PATCH 2/2] Fix computation of allocated size for query.

[Pablo Neira Ayuso]

Eric Leblond wrote:
> This patch fixes the computation of the allocation size for the query.
> It was not taking into account the length of the name of the procedure.

Applied. Thanks.

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers

Re: [ULOGD2 PATCH 1/2] Suppress subversion specific dist-hook.

[Pablo Neira Ayuso]

Eric Leblond wrote:
> This patch suppress a dist-hook in Makefile.am which was related
> to the suppression of some subversion related files.

Applied. Thanks Eric.

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers