--------------------- PatchSet 2392 Date: 2001/05/28 12:59:51 Author: rvenning Branch: ipv6 Tag: (none) Log: acl make_mask fix & also got autoheader & autoconf going in my branch again (INET6 default was missing from acconfig.h) Members: acconfig.h:1.3.6.3->1.3.6.4 include/config.h.in:1.3.6.3->1.3.6.4 src/acl.c:1.4.6.6->1.4.6.7 Index: squid/acconfig.h =================================================================== RCS file: /cvsroot/squid-sf//squid/Attic/acconfig.h,v retrieving revision 1.3.6.3 retrieving revision 1.3.6.4 diff -u -r1.3.6.3 -r1.3.6.4 --- squid/acconfig.h 27 May 2001 13:21:10 -0000 1.3.6.3 +++ squid/acconfig.h 28 May 2001 12:59:51 -0000 1.3.6.4 @@ -23,7 +23,7 @@ #ifndef __CONFIGURE_H__ #define __CONFIGURE_H__ @TOP@ -/* $Id: acconfig.h,v 1.3.6.3 2001/05/27 13:21:10 rvenning Exp $ */ +/* $Id: acconfig.h,v 1.3.6.4 2001/05/28 12:59:51 rvenning Exp $ */ /********************************* * START OF CONFIGURABLE OPTIONS * @@ -330,6 +330,8 @@ */ #undef X_ACCELERATOR_VARY +#undef INET6 + @BOTTOM@ #endif /* __CONFIGURE_H__ */ Index: squid/include/config.h.in =================================================================== RCS file: /cvsroot/squid-sf//squid/include/Attic/config.h.in,v retrieving revision 1.3.6.3 retrieving revision 1.3.6.4 diff -u -r1.3.6.3 -r1.3.6.4 --- squid/include/config.h.in 23 Mar 2001 16:06:25 -0000 1.3.6.3 +++ squid/include/config.h.in 28 May 2001 12:59:52 -0000 1.3.6.4 @@ -1,5 +1,5 @@ /* - * $Id: config.h.in,v 1.3.6.3 2001/03/23 16:06:25 rvenning Exp $ + * $Id: config.h.in,v 1.3.6.4 2001/05/28 12:59:52 rvenning Exp $ * * AUTHOR: Duane Wessels * Index: squid/src/acl.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/acl.c,v retrieving revision 1.4.6.6 retrieving revision 1.4.6.7 diff -u -r1.4.6.6 -r1.4.6.7 --- squid/src/acl.c 27 May 2001 16:48:15 -0000 1.4.6.6 +++ squid/src/acl.c 28 May 2001 12:59:52 -0000 1.4.6.7 @@ -1,6 +1,6 @@ /* - * $Id: acl.c,v 1.4.6.6 2001/05/27 16:48:15 rvenning Exp $ + * $Id: acl.c,v 1.4.6.7 2001/05/28 12:59:52 rvenning Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -378,7 +378,7 @@ memset(mask, 0xff, sizeof(*mask)); for (bp = len/8; bp < sizeof(struct IN_ADDR); bp++) { - int clearbits = bp*8 - len; + int clearbits = (bp+1)*8 - len; if (clearbits > 0) { if (clearbits >= 8) mask->s6_addr[bp] = 0;