Allow for external_acl includes

  acl name external "/path/to/file"

diff --git a/src/acl.cc b/src/acl.cc
index 7ae7258c3d965dfa61406bc4120e44c762674b3e..c329a96bb4f2452b83912d636629970b10896108 100644 (file)
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.cc,v 1.282 2002/09/01 15:16:33 hno Exp $
+ * $Id: acl.cc,v 1.283 2002/09/05 21:09:23 hno Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -50,7 +50,7 @@ static void aclParseProtoList(void *curlist);
 static void aclParseMethodList(void *curlist);
 static void aclParseTimeSpec(void *curlist);
 static void aclParseIntRange(void *curlist);
-static char *strtokFile(void);
+extern char *strtokFile(void);
 static void aclDestroyTimeList(acl_time_data * data);
 static void aclDestroyIntRange(intrange *);
 static void aclLookupProxyAuthStart(aclCheck_t * checklist);
@@ -107,7 +107,7 @@ static SPLAYWALKEE aclDumpArpListWalkee;
 #endif
 static int aclCacheMatchAcl(dlink_list * cache, squid_acl acltype, void *data, char *MatchParam);
 
-static char *
+char *
 strtokFile(void)
 {
     char *t, *fn;

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 4f4e2bf057bc1973bf9200222b6f1c23c6886e3c..8b5fe5cf1518acbaf52af9c0b2c3e9ad057eea3c 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.9 2002/08/22 12:29:15 hno Exp $
+ * $Id: external_acl.cc,v 1.10 2002/09/05 21:09:24 hno Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -57,6 +57,8 @@ static void external_acl_cache_delete(external_acl * def, external_acl_entry * e
 static int external_acl_entry_expired(external_acl * def, external_acl_entry * entry);
 static void external_acl_cache_touch(external_acl * def, external_acl_entry * entry);
 
+extern char *strtokFile(void);
+
 /*******************************************************************
  * external_acl cache entry
  * Used opaqueue in the interface
@@ -384,7 +386,7 @@ aclParseExternal(void *dataptr)
     data->def = cbdataReference(find_externalAclHelper(token));
     if (!data->def)
        self_destruct();
-    while ((token = strtok(NULL, w_space))) {
+    while ((token = strtokFile())) {
        wordlistAdd(&data->arguments, token);
     }
     *datap = data;