Resolved merge conflicts

diff --git a/src/ACLIP.cc b/src/ACLIP.cc
index db73250a70e73a50b7310c0cfe2d8ac121584189..23df67b1cda6749bbf3d11e99de84ea2c44d62e0 100644 (file)
--- a/src/ACLIP.cc
+++ b/src/ACLIP.cc
@@ -300,7 +300,7 @@ acl_ip_data::FactoryParse(const char *t)
     if (!safe_inet_addr(addr2, &q->addr2)) {
         debug(28, 0) ("aclParseIpData: unknown second address in '%s'\n", t);
         delete q;
-        self_desctruct();
+        self_destruct();
         return NULL;
     }
 

diff --git a/src/ACLMaxUserIP.h b/src/ACLMaxUserIP.h
index 02630368dadd58d30ba1a26cfa5e022c821f5dd7..5206f95bcd9bef5510fd7753cc54235189e2d9fc 100644 (file)
--- a/src/ACLMaxUserIP.h
+++ b/src/ACLMaxUserIP.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLMaxUserIP.h,v 1.6 2005/05/06 01:57:55 hno Exp $
+ * $Id: ACLMaxUserIP.h,v 1.7 2005/05/06 02:37:36 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -54,6 +54,7 @@ public:
     virtual void parse();
     virtual int match(ACLChecklist *checklist);
     virtual wordlist *dump() const;
+    virtual bool empty () const;
     virtual bool valid () const;
     virtual bool requiresRequest() const {return true;}