From d35d9c6c40c8d73db9095f871df10056799678e3 Mon Sep 17 00:00:00 2001
From: laforge <laforge>
Date: Fri, 24 Jun 2005 16:28:56 +0000
Subject: minor updates

---
 include/ulogd/ulogd.h | 5 ++---
 ulogd.c               | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h
index 1382251..1000fb1 100644
--- a/include/ulogd/ulogd.h
+++ b/include/ulogd/ulogd.h
@@ -3,7 +3,7 @@
 /* ulogd, Version $Revision$
  *
  * userspace logging daemon for netfilter ULOG target
- * of the linux 2.4 netfilter subsystem.
+ * of the linux 2.4/2.6 netfilter subsystem.
  *
  * (C) 2000-2005 by Harald Welte <laforge@gnumonks.org>
  *
@@ -161,8 +161,7 @@ struct ulogd_pluginstance {
 	/* per-instance output keys */
 	struct ulogd_key *output;
 	/* per-instance config parameters (array) */
-	struct config_entry *configs;
-	unsigned int num_configs;
+	struct config_entry *config_kset;
 	/* private data */
 	char private[0];
 };
diff --git a/ulogd.c b/ulogd.c
index 41598a4..4566f55 100644
--- a/ulogd.c
+++ b/ulogd.c
@@ -4,7 +4,7 @@
  *
  * unified network logging daemon for Linux.
  *
- * (C) 2000-2004 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2000-2005 by Harald Welte <laforge@gnumonks.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 
@@ -19,8 +19,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id$
- *
  * Modifications:
  * 	14 Jun 2001 Martin Josefsson <gandalf@wlug.westbo.se>
  * 		- added SIGHUP handler for logfile cycling
@@ -441,7 +439,7 @@ pluginstance_alloc_init(struct ulogd_plugin *pl, char *pi_id,
 	pi->config_kset.num_ces = pl->config_kset->num_ces;
 	ce_size = pl->config_kset->num_ces*sizeof(struct config_entry);
 	pi->config_kset.ces = malloc(ce_size);
-	if (!pi->configs) {
+	if (!pi->config_kset.ces) {
 		free(pi);
 		return NULL;
 	}
@@ -503,7 +501,7 @@ static int create_stack(char *option)
 		}
 
 		/* allocate */
-		pi = ulogd_pluginstance_alloc_init(pl. pi_id, stack);
+		pi = ulogd_pluginstance_alloc_init(pl, pi_id, stack);
 		if (!pi) {
 			ulogd_log(ULOGD_ERROR, 
 				  "unable to allocate pluginstance for %s\n",
-- 
cgit v1.2.3