Fixed checking of trusted users. Tweaks to compile under FreeBSD 4.10. Added

debug output option.

1 files changed, 53 insertions, 41 deletions

diff --git a/src/Makefile b/src/Makefile
index 15b4775..508cd54 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,11 +18,16 @@
 # 
 # -------------------------------------------------------------------------
 # 
-# $Id: Makefile,v 1.7 2004-01-26 02:01:49 ianc Exp $
+# $Id: Makefile,v 1.8 2004-06-05 01:09:58 ianc Exp $
 # 
 
-# CFLAGS assumes that gcc is being used - simply comment out if required
-CFLAGS	=	-g -Wall -Werror
+# Uncomment for debug output
+#
+# DEBUG	=	-DKBS_DEBUG
+
+# CFLAGS assumes that gcc is being used - simply change as required
+#
+CFLAGS	=	-g -Wall -Werror $(DEBUG)
 
 TARGET	=	kbs
 
@@ -32,6 +37,7 @@ SOURCE	=	kbs.c		\
 		rexp.c		\
 		dbase.c		\
 		dstring.c	\
+		debug.c		\
 		util.c
 
 OBJECTS	=	kbs.o		\
@@ -40,6 +46,7 @@ OBJECTS	=	kbs.o		\
 		rexp.o		\
 		dbase.o		\
 		dstring.o	\
+		debug.o		\
 		util.o
 
 $(TARGET): $(OBJECTS)
@@ -50,56 +57,61 @@ clean:
 
 depend:
 	make clean
-	makedepend  -- $(CFLAGS) -- $(SOURCE)
+	makedepend  -- $(CFLAGS) $(DEBUG) -- $(SOURCE)
 	if test -e Makefile ; then rm -f Makefile.bak ; fi
 
 # DO NOT DELETE THIS LINE -- make depend depends on it
 
 kbs.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-kbs.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
-kbs.o: /usr/include/limits.h /usr/include/sys/limits.h
-kbs.o: /usr/include/machine/_limits.h /usr/include/sys/syslimits.h
-kbs.o: /usr/include/stdio.h /usr/include/string.h /usr/include/strings.h
-kbs.o: /usr/include/stdarg.h /usr/include/time.h /usr/include/sys/timespec.h
+kbs.o: /usr/include/machine/ansi.h /usr/include/limits.h
+kbs.o: /usr/include/sys/_posix.h /usr/include/machine/limits.h
+kbs.o: /usr/include/sys/syslimits.h /usr/include/stdio.h
+kbs.o: /usr/include/string.h /usr/include/stdarg.h /usr/include/time.h
 kbs.o: /usr/include/errno.h global.h config.h pop3.h msg.h dbase.h rexp.h
-kbs.o: dstring.h util.h
+kbs.o: dstring.h debug.h util.h
 pop3.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-pop3.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
-pop3.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdio.h
-pop3.o: /usr/include/stdarg.h /usr/include/ctype.h /usr/include/runetype.h
-pop3.o: /usr/include/unistd.h /usr/include/sys/types.h
-pop3.o: /usr/include/machine/endian.h /usr/include/sys/select.h
-pop3.o: /usr/include/sys/_sigset.h /usr/include/sys/_timeval.h
-pop3.o: /usr/include/sys/timespec.h /usr/include/sys/unistd.h
-pop3.o: /usr/include/sys/socket.h /usr/include/sys/_iovec.h
-pop3.o: /usr/include/machine/param.h /usr/include/netinet/in.h
+pop3.o: /usr/include/machine/ansi.h /usr/include/string.h
+pop3.o: /usr/include/stdio.h /usr/include/stdarg.h /usr/include/ctype.h
+pop3.o: /usr/include/runetype.h /usr/include/unistd.h
+pop3.o: /usr/include/sys/types.h /usr/include/sys/inttypes.h
+pop3.o: /usr/include/machine/types.h /usr/include/machine/endian.h
+pop3.o: /usr/include/sys/unistd.h /usr/include/sys/_posix.h
+pop3.o: /usr/include/sys/select.h /usr/include/sys/event.h
+pop3.o: /usr/include/sys/queue.h /usr/include/sys/socket.h
+pop3.o: /usr/include/machine/param.h /usr/include/sys/time.h
+pop3.o: /usr/include/time.h /usr/include/netinet/in.h
 pop3.o: /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h
 pop3.o: /usr/include/netdb.h global.h pop3.h msg.h dstring.h util.h
 config.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-config.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
-config.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdio.h
-config.o: /usr/include/errno.h /usr/include/ctype.h /usr/include/runetype.h
-config.o: global.h config.h dstring.h dbase.h msg.h rexp.h util.h
+config.o: /usr/include/machine/ansi.h /usr/include/string.h
+config.o: /usr/include/stdio.h /usr/include/errno.h /usr/include/ctype.h
+config.o: /usr/include/runetype.h global.h config.h dstring.h dbase.h msg.h
+config.o: rexp.h util.h
 rexp.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-rexp.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
+rexp.o: /usr/include/machine/ansi.h /usr/include/unistd.h
+rexp.o: /usr/include/sys/types.h /usr/include/sys/inttypes.h
+rexp.o: /usr/include/machine/types.h /usr/include/machine/endian.h
+rexp.o: /usr/include/sys/unistd.h /usr/include/sys/_posix.h
 rexp.o: /usr/include/regex.h global.h rexp.h config.h util.h
 dbase.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-dbase.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
-dbase.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdio.h
-dbase.o: /usr/include/ctype.h /usr/include/runetype.h global.h dbase.h msg.h
-dbase.o: rexp.h dstring.h config.h util.h
+dbase.o: /usr/include/machine/ansi.h /usr/include/string.h
+dbase.o: /usr/include/strings.h /usr/include/stdio.h /usr/include/ctype.h
+dbase.o: /usr/include/runetype.h global.h dbase.h msg.h rexp.h dstring.h
+dbase.o: config.h debug.h util.h
 dstring.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-dstring.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
-dstring.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdio.h
-dstring.o: /usr/include/stdarg.h /usr/include/ctype.h /usr/include/runetype.h
-dstring.o: /usr/include/sys/types.h /usr/include/machine/endian.h
-dstring.o: /usr/include/sys/select.h /usr/include/sys/_sigset.h
-dstring.o: /usr/include/sys/_timeval.h /usr/include/sys/timespec.h
-dstring.o: /usr/include/sys/socket.h /usr/include/sys/_iovec.h
-dstring.o: /usr/include/machine/param.h /usr/include/netinet/in.h
-dstring.o: /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h
-dstring.o: /usr/include/netdb.h global.h dstring.h util.h
+dstring.o: /usr/include/machine/ansi.h /usr/include/string.h
+dstring.o: /usr/include/stdio.h /usr/include/stdarg.h /usr/include/ctype.h
+dstring.o: /usr/include/runetype.h /usr/include/sys/types.h
+dstring.o: /usr/include/sys/inttypes.h /usr/include/machine/types.h
+dstring.o: /usr/include/machine/endian.h /usr/include/sys/select.h
+dstring.o: /usr/include/sys/event.h /usr/include/sys/queue.h
+dstring.o: /usr/include/sys/socket.h /usr/include/machine/param.h
+dstring.o: /usr/include/netinet/in.h /usr/include/netinet6/in6.h
+dstring.o: /usr/include/netinet/tcp.h /usr/include/netdb.h global.h dstring.h
+dstring.o: util.h
+debug.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
+debug.o: /usr/include/machine/ansi.h /usr/include/stdio.h
+debug.o: /usr/include/stdarg.h global.h debug.h
 util.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
-util.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
-util.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdio.h
-util.o: global.h util.h
+util.o: /usr/include/machine/ansi.h /usr/include/string.h
+util.o: /usr/include/stdio.h global.h util.h