From bdbcc97b9521a1d02dafcb0c4f447adea259dd76 Mon Sep 17 00:00:00 2001
From: wessels <>
Date: Fri, 12 Apr 1996 06:11:02 +0000
Subject: [PATCH] remove unneeded blocklist stuff

---
 src/Makefile.in | 7 ++-----
 src/cache_cf.cc | 6 +++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index ac03f78f28..9185c2f2f1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Harvest Object Cache server
 #
-#  $Id: Makefile.in,v 1.16 1996/04/11 23:51:56 wessels Exp $
+#  $Id: Makefile.in,v 1.17 1996/04/12 00:11:02 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -20,9 +20,6 @@ INSTALL		= @INSTALL@
 INSTALL_BIN 	= @INSTALL_PROGRAM@
 INSTALL_FILE 	= @INSTALL_DATA@
 RANLIB		= @RANLIB@
-YACC		= @YACC@
-LEX		= @LEX@
-LEXLIB		= @LEXLIB@
 LN_S		= @LN_S@
 PERL		= @CMD_PERL@
 CRYPT_LIB	= @CRYPT_LIB@
@@ -53,7 +50,7 @@ CLIENT_LIBS	= -L../lib -lutil $(XTRA_LIBS)
 PROGS		= cached 
 UTILS		= client dnsserver ftpget
 CGIPROGS	= cachemgr.cgi
-OBJS	 	= acl.o blocklist.o cache_cf.o cached_error.o comm.o \
+OBJS	 	= acl.o cache_cf.o cached_error.o comm.o \
 		connect.o debug.o disk.o dynamic_array.o \
 		fdstat.o filemap.o ftp.o gopher.o \
 		hash.o http.o icp.o ipcache.o \
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 4388daf109..e7de019f84 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,4 +1,4 @@
-/* $Id: cache_cf.cc,v 1.36 1996/04/11 23:51:57 wessels Exp $ */
+/* $Id: cache_cf.cc,v 1.37 1996/04/12 00:11:02 wessels Exp $ */
 
 /* DEBUG: Section 3             cache_cf: Configuration file parsing */
 
@@ -956,6 +956,7 @@ static void parseBindAddressLine()
     wordlistAdd(&Config.bind_addr_list, token);
 }
 
+#ifdef OLD_CODE
 static void parseBlockListLine()
 {
     char *token;
@@ -964,6 +965,7 @@ static void parseBlockListLine()
 	return;
     blockAddToList(token);
 }
+#endif
 
 static void parseLocalDomainLine()
 {
@@ -1280,9 +1282,11 @@ int parseConfigFile(file_name)
 	else if (!strcmp(token, "ttl_pattern"))
 	    parseTTLPattern();
 
+#ifdef OLD_CODE
 	/* Parse a blocklist line */
 	else if (!strcmp(token, "blocklist"))
 	    parseBlockListLine();
+#endif
 
 	/* Parse a negative_ttl line */
 	else if (!strcmp(token, "negative_ttl"))
-- 
2.47.3