diff -ruN radius.orig/src/Makefile radius/src/Makefile
--- radius.orig/src/Makefile	Wed Jun 23 16:52:02 1999
+++ radius/src/Makefile	Mon Dec 27 11:08:44 1999
@@ -134,70 +134,70 @@
 	- mkdir -p $(OBJDIR)
 
 $(OBJDIR)/radiusd: $(RAD_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(RAD_OBJS) $(LIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $(RAD_OBJS) $(LIBS)
 
 
 $(OBJDIR)/builddbm: $(OBJDIR)/builddbm.o $(OBJDIR)/version.o $(OBJDIR)/log.o $(HEADERS)
-	$(CC) $(CFLAGS) -o $@ $(OBJDIR)/builddbm.o $(OBJDIR)/version.o $(OBJDIR)/log.o $(LIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $(OBJDIR)/builddbm.o $(OBJDIR)/version.o $(OBJDIR)/log.o $(LIBS)
 
 $(OBJDIR)/md5test: $(SRCDIR)/md5test.c $(HEADERS) $(OBJDIR)/md5.o
-	$(CC) $(CFLAGS) -o $@ $(SRCDIR)/md5test.c $(OBJDIR)/md5.o 
+	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $(SRCDIR)/md5test.c $(OBJDIR)/md5.o 
 
 $(OBJDIR)/radtest: $(SRCDIR)/radtest.c $(HEADERS) $(OBJDIR)/md5.o $(OBJDIR)/dict.o $(OBJDIR)/util.o $(OBJDIR)/log.o
-	$(CC) $(CFLAGS) -o $@ $(SRCDIR)/radtest.c $(OBJDIR)/md5.o $(OBJDIR)/dict.o $(OBJDIR)/util.o $(OBJDIR)/log.o $(LIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $(SRCDIR)/radtest.c $(OBJDIR)/md5.o $(OBJDIR)/dict.o $(OBJDIR)/util.o $(OBJDIR)/log.o $(LIBS)
 
 $(OBJDIR)/testuser: $(SRCDIR)/testuser.c $(HEADERS) $(TEST_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(SRCDIR)/testuser.c $(TEST_OBJS) $(LIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $(SRCDIR)/testuser.c $(TEST_OBJS) $(LIBS)
 
 $(OBJDIR)/dbmkeys: $(SRCDIR)/dbmkeys.c
-	$(CC) $(CFLAGS) -o $@ $(SRCDIR)/dbmkeys.c $(LIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $(SRCDIR)/dbmkeys.c $(LIBS)
 
 $(OBJDIR)/dbmrec: $(SRCDIR)/dbmrec.c $(HEADERS) $(TEST_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(SRCDIR)/dbmrec.c $(TEST_OBJS) $(LIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $(SRCDIR)/dbmrec.c $(TEST_OBJS) $(LIBS)
 
 $(OBJDIR)/builddbm.o:	$(SRCDIR)/builddbm.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/builddbm.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/builddbm.c
 $(OBJDIR)/radiusd.o:	$(SRCDIR)/radiusd.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/radiusd.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/radiusd.c
 $(OBJDIR)/users.o:	$(SRCDIR)/users.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/users.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/users.c
 $(OBJDIR)/dict.o:	$(SRCDIR)/dict.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/dict.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/dict.c
 $(OBJDIR)/util.o:	$(SRCDIR)/util.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/util.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/util.c
 $(OBJDIR)/md5.o:	$(SRCDIR)/md5.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/md5.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/md5.c
 $(OBJDIR)/acct.o:	$(SRCDIR)/acct.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/acct.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/acct.c
 $(OBJDIR)/version.o:	$(SRCDIR)/version.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/version.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/version.c
 $(OBJDIR)/menu.o:	$(SRCDIR)/menu.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/menu.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/menu.c
 $(OBJDIR)/log.o:	$(SRCDIR)/log.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/log.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/log.c
 $(OBJDIR)/proxy.o:	$(SRCDIR)/proxy.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/proxy.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/proxy.c
 $(OBJDIR)/ipass.o:	$(SRCDIR)/ipass.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/ipass.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/ipass.c
 $(OBJDIR)/pass.o:	$(SRCDIR)/pass.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/pass.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/pass.c
 $(OBJDIR)/vports.o:	$(SRCDIR)/vports.c
-	$(CC) -c -o $@ $(CFLAGS) $(SRCDIR)/vports.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $(SRCDIR)/vports.c
 #
 # SecurID and Activcard support
 #
 sradiusd: $(OBJDIR)/sradiusd
 $(OBJDIR)/sradiusd: $(SRAD_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(SRAD_OBJS) $(SLIBS) $(LIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $(SRAD_OBJS) $(SLIBS) $(LIBS)
 $(OBJDIR)/securid.o:	$(SRCDIR)/securid.c $(SDHEADERS)
-	$(CC) -c -o $@ $(CFLAGS) -DSECURID -DACTIVCARD $(SRCDIR)/securid.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) -DSECURID -DACTIVCARD $(SRCDIR)/securid.c
 $(OBJDIR)/sversion.o:	$(SRCDIR)/version.c
-	$(CC) -c -o $@ -DSECURID -DACTIVCARD $(CFLAGS) $(SRCDIR)/version.c
+	$(CC) -c -o $@ -DSECURID -DACTIVCARD $(CFLAGS) $(INCLUDES) $(SRCDIR)/version.c
 $(OBJDIR)/sradiusd.o:	$(SRCDIR)/radiusd.c $(SDHEADERS)
-	$(CC) -c -o $@ $(CFLAGS) -DSECURID -DACTIVCARD $(SRCDIR)/radiusd.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) -DSECURID -DACTIVCARD $(SRCDIR)/radiusd.c
 #
 $(OBJDIR)/activcard.o:	$(SRCDIR)/activcard.c $(SDHEADERS)
-	$(CC) -c -o $@ $(CFLAGS) -DSECURID -DACTIVCARD $(SRCDIR)/activcard.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDES) -DSECURID -DACTIVCARD $(SRCDIR)/activcard.c
 #
 # Ipass support
 #
@@ -205,6 +205,6 @@
 $(OBJDIR)/iradiusd: $(IRAD_OBJS)
 	$(CC) $(ILDFLAGS) -o $@ $(IRAD_OBJS) $(ILIBS)
 $(OBJDIR)/iipass.o:	$(SRCDIR)/ipass.c
-	$(CC) -c -o $@ $(ICFLAGS) -DIPASS $(SRCDIR)/ipass.c
+	$(CC) -c -o $@ $(ICFLAGS) $(IINCLUDES) -DIPASS $(SRCDIR)/ipass.c
 $(OBJDIR)/iversion.o:	$(SRCDIR)/version.c
-	$(CC) -c -o $@ $(ICFLAGS) -DIPASS $(SRCDIR)/version.c
+	$(CC) -c -o $@ $(ICFLAGS) $(IINCLUDES) -DIPASS $(SRCDIR)/version.c
diff -ruN radius.orig/src/conf/RedHat_Linux_6.0 radius/src/conf/RedHat_Linux_6.0
--- radius.orig/src/conf/RedHat_Linux_6.0	Wed Dec 31 16:00:00 1969
+++ radius/src/conf/RedHat_Linux_6.0	Mon Dec 27 11:03:56 1999
@@ -0,0 +1,6 @@
+# System: Linux 2.0.30 #6 Wed May 21 15:59:30 PDT 1997 i586
+# RedHat Linux 6.0
+#
+RADLIBS         = -lgdbm -lcrypt
+INCLUDES        = -I/usr/include/db1
+
diff -ruN radius/src/dbmkeys.c radius.mark/src/dbmkeys.c
--- radius/src/dbmkeys.c	Thu Jun 24 09:40:38 1999
+++ radius.mark/src/dbmkeys.c	Thu Jul  5 00:27:32 2001
@@ -61,7 +61,6 @@
 #endif /* not NDBM */
 
 extern int errno;
-extern char *sys_errlist[];
 
 main(argc, argv)
 int argc;
diff -ruN radius/src/dbmrec.c radius.mark/src/dbmrec.c
--- radius/src/dbmrec.c	Thu Jun 24 09:40:39 1999
+++ radius.mark/src/dbmrec.c	Thu Jul  5 00:27:46 2001
@@ -70,7 +70,6 @@
 int		debug_mem = 0;
 
 extern int errno;
-extern char * sys_errlist[];
 
 int
 main(argc, argv)