bugfix: ICAPConfig calls aclParseAccessLine(), which now takes a

ConfigParser argument.  Use the LegacyParser from cache_cf.cc, but
we need to make it global instead of static.

diff --git a/src/ICAP/ICAPConfig.cc b/src/ICAP/ICAPConfig.cc
index 90f64807c455401efa386ff6f8bd753b68f6637a..4d3c634a924948bb4454c16d4a85ca002be6a372 100644 (file)
--- a/src/ICAP/ICAPConfig.cc
+++ b/src/ICAP/ICAPConfig.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPConfig.cc,v 1.7 2006/04/23 14:14:18 serassio Exp $
+ * $Id: ICAPConfig.cc,v 1.8 2006/04/27 19:07:16 wessels Exp $
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -45,6 +45,7 @@
 #include "ACLChecklist.h"
 #include "wordlist.h"
 
+extern ConfigParser LegacyParser;      // from cache_cf.cc
 ICAPConfig TheICAPConfig;
 
 ICAPServiceRep::Pointer
@@ -360,7 +361,7 @@ ICAPConfig::parseICAPAccess()
         fatalf("Did not find ICAP class '%s' referenced on line %d\n",
                aKey.buf(), config_lineno);
 
-    aclParseAccessLine(&theClass->accessList);
+    aclParseAccessLine(LegacyParser, &theClass->accessList);
 };
 
 void

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index e98caf1544be353b2e8686b1727123d05f40a93c..7778a5299eb0d561a6b6b91b4749ce020719c534 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.491 2006/04/25 12:00:29 robertc Exp $
+ * $Id: cache_cf.cc,v 1.492 2006/04/27 19:07:16 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -146,7 +146,7 @@ static int check_null_https_port_list(const https_port_list *);
 static void parse_b_size_t(size_t * var);
 
 /* a parser for legacy code that uses the global approach */
-static ConfigParser LegacyParser = ConfigParser();
+ConfigParser LegacyParser = ConfigParser();
 
 void
 self_destruct(void)