From: wessels <>
Date: Sat, 11 Jan 1997 01:48:42 +0000 (+0000)
Subject: remove OLD_CODE
X-Git-Tag: SQUID_3_0_PRE1~5220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dacd1c2e9ecf5f3a88df7fe6ea1c26fdbafe066;p=thirdparty%2Fsquid.git

remove OLD_CODE
---

diff --git a/src/acl.cc b/src/acl.cc
index 503551cbe4..762d254159 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.71 1996/12/20 23:45:35 wessels Exp $
+ * $Id: acl.cc,v 1.72 1997/01/10 18:48:42 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -280,22 +280,6 @@ aclParseIpList(void)
 	    memset(addr2, 0, 256);
 	    memset(mask, 0, 256);
 
-#ifdef OLD_CODE
-	    /* This breaks on "www-cache.uninett.no" because of the dash */
-	    /* Split the adress in addr1-addr2/mask */
-	    strncpy(addr1, p, strcspn(p, "-/"));
-	    p += strcspn(p, "-/");
-	    if (*p == '-') {
-		p++;
-		strncpy(addr2, p, strcspn(p, "/"));
-		p += strcspn(p, "/");
-	    }
-	    if (*p == '/') {
-		p++;
-		strcpy(mask, p);
-	    }
-#endif
-#ifndef NEW_CODE
 	    for (;;) {
 		if (sscanf(t, "%[0-9.]-%[0-9.]/%[0-9.]", addr1, addr2, mask) == 3)
 		    break;
@@ -324,7 +308,7 @@ aclParseIpList(void)
 		debug(28, 0, "aclParseIpList: Bad host/IP: '%s'\n", t);
 		break;
 	    }
-#endif
+
 	    /* Decode addr1 */
 	    if (!decode_addr(addr1, &q->addr1, &q->mask)) {
 		debug(28, 0, "%s line %d: %s\n",