remove unneeded blocklist stuff

diff --git a/src/Makefile.in b/src/Makefile.in
index ac03f78f285d536817de9994ab81ac2d5f2068d8..9185c2f2f19b060f95c749166d7f6c6ca04169cc 100644 (file)
--- 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 4388daf1090177bc71cd0b6e81a4ed8e72fe87b3..e7de019f84c6bf96b1a513c93a090f3fe64e546b 100644 (file)
--- 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"))