email addresses changed

6 files changed, 20 insertions, 15 deletions

diff --git a/ulogd/Makefile b/ulogd/Makefile
index 15963c3..6d80dfb 100644
--- a/ulogd/Makefile
+++ b/ulogd/Makefile
@@ -8,7 +8,9 @@ ULOGD_SL:=BASE OPRINT PWSNIFF
 #  Normally You should not need to change anything below
 #
 CC = gcc
-CFLAGS = -I. -g -Wall $(INCIPULOG) # -DDEBUG # -DDEBUG_CONF
+CFLAGS = -I. -Wall $(INCIPULOG) -O2
+#CFLAGS+=-g -DDEBUG
+
 SH_CFLAGS:=$(CFLAGS) -fPIC
 
 SHARED_LIBS+=$(foreach T,$(ULOGD_SL),extensions/ulogd_$(T).so)
diff --git a/ulogd/README b/ulogd/README
index 46a36ea..9c0f251 100644
--- a/ulogd/README
+++ b/ulogd/README
@@ -36,4 +36,6 @@ that difficult.
 Just copy the plugins into /usr/local/lib/ulogd and the ulogd to wherever 
 You want it to be.
 
-===>
+===> QUESTIONS / COMMENTS
+
+Just drop me a note to laforge@gnumonks.org
diff --git a/ulogd/conffile.c b/ulogd/conffile.c
index 987a5d8..2489c8d 100644
--- a/ulogd/conffile.c
+++ b/ulogd/conffile.c
@@ -1,7 +1,7 @@
 /* config file parser functions
  * (C) 2000 by Harald Welte <laforge@gnumonks.org>
  *
- * $Id: conffile.c,v 1.4 2000/09/09 21:55:46 laforge Exp $
+ * $Id: conffile.c,v 1.5 2000/09/12 14:29:36 laforge Exp $
  * 
  * This code is distributed under the terms of GNU GPL */
 
@@ -125,8 +125,8 @@ int config_parse_file(int final)
 
 		/* if we do the final parse and word is not a config key */
 		if (final && config_iskey(word)) {
+			DEBUGC("final and key '%s' not found\n", word);
 			err = -ERRUNKN;
-			config_errce = ce;
 			goto cpf_error;
 		}
 
diff --git a/ulogd/extensions/ulogd_BASE.c b/ulogd/extensions/ulogd_BASE.c
index 290ad0b..b7a5410 100644
--- a/ulogd/extensions/ulogd_BASE.c
+++ b/ulogd/extensions/ulogd_BASE.c
@@ -1,11 +1,11 @@
-/* ulogd_MAC.c, Version $Revision: 1.3 $
+/* ulogd_MAC.c, Version $Revision: 1.4 $
  *
- * ulogd logging interpreter for MAC addresses, TIME, etc.
+ * ulogd logging interpreter for MAC addresses, TIME, IP and TCP headers, etc.
  *
- * (C) 2000 by Harald Welte <laforge@sunbeam.franken.de>
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org>
  * This software is released under the terms of GNU GPL
  *
- * $Id: ulogd_BASE.c,v 1.3 2000/08/14 08:28:24 laforge Exp $
+ * $Id: ulogd_BASE.c,v 1.4 2000/09/12 14:29:37 laforge Exp $
  *
  */
 
@@ -188,7 +188,7 @@ ulog_iret_t *_interp_icmp(ulog_packet_msg_t *pkt)
 	struct iphdr *iph = (struct iphdr *) pkt->payload;
 	void *protoh = (u_int32_t *) (iph + iph->ihl);
 	struct icmphdr *icmph = protoh;
-	ulog_iret_t *ret, *ret2;
+	ulog_iret_t *ret;
 
 	if (iph->protocol != IPPROTO_ICMP)
 		return NULL;
diff --git a/ulogd/extensions/ulogd_OPRINT.c b/ulogd/extensions/ulogd_OPRINT.c
index 2d8e608..0b551b6 100644
--- a/ulogd/extensions/ulogd_OPRINT.c
+++ b/ulogd/extensions/ulogd_OPRINT.c
@@ -1,11 +1,11 @@
-/* ulogd_MAC.c, Version $Revision: 1.2 $
+/* ulogd_MAC.c, Version $Revision: 1.3 $
  *
  * ulogd output target for logging to a file 
  *
- * (C) 2000 by Harald Welte <laforge@sunbeam.franken.de>
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org>
  * This software is released under the terms of GNU GPL
  *
- * $Id: ulogd_OPRINT.c,v 1.2 2000/08/14 08:28:24 laforge Exp $
+ * $Id: ulogd_OPRINT.c,v 1.3 2000/09/12 14:29:37 laforge Exp $
  *
  */
 
diff --git a/ulogd/extensions/ulogd_PWSNIFF.c b/ulogd/extensions/ulogd_PWSNIFF.c
index 4fe5a62..f8e1327 100644
--- a/ulogd/extensions/ulogd_PWSNIFF.c
+++ b/ulogd/extensions/ulogd_PWSNIFF.c
@@ -1,11 +1,11 @@
-/* ulogd_PWSNIFF.c, Version $Revision: 1.3 $
+/* ulogd_PWSNIFF.c, Version $Revision: 1.1 $
  *
  * ulogd logging interpreter for POP3 / FTP like plaintext passwords.
  *
- * (C) 2000 by Harald Welte <laforge@sunbeam.franken.de>
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org>
  * This software is released under the terms of GNU GPL
  *
- * $Id: ulogd_PWSNIFF.c,v 1.3 2000/08/14 08:28:24 laforge Exp $
+ * $Id: ulogd_PWSNIFF.c,v 1.1 2000/08/17 08:03:22 laforge Exp $
  *
  */
 
@@ -58,6 +58,7 @@ static ulog_iret_t *_interp_pwsniff(ulog_packet_msg_t *pkt)
 	int len, pw_len, i, cont = 0;
 
 	len = pw_len = 0;
+	begp = pw_begp = NULL;
 
 	if (iph->protocol != IPPROTO_TCP)
 		return NULL;