--------------------- PatchSet 1462 Date: 2005/06/16 10:32:00 Author: rmartinez Branch: squid3-ipv6 Tag: (none) Log: Updating Guido's transient patch Members: src/neighbors.cc:1.23.4.6->1.23.4.7 src/snmp_core.cc:1.10.8.3->1.10.8.4 src/tunnel.cc:1.13.4.1->1.13.4.2 Index: squid3/src/neighbors.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/neighbors.cc,v retrieving revision 1.23.4.6 retrieving revision 1.23.4.7 diff -u -r1.23.4.6 -r1.23.4.7 --- squid3/src/neighbors.cc 1 Jun 2005 16:28:57 -0000 1.23.4.6 +++ squid3/src/neighbors.cc 16 Jun 2005 10:32:00 -0000 1.23.4.7 @@ -1,6 +1,6 @@ /* - * $Id: neighbors.cc,v 1.23.4.6 2005/06/01 16:28:57 rmartinez Exp $ + * $Id: neighbors.cc,v 1.23.4.7 2005/06/16 10:32:00 rmartinez Exp $ * * DEBUG: section 15 Neighbor Routines * AUTHOR: Harvest Derived @@ -185,7 +185,7 @@ checklist.request = requestLink(request); - checklist.accessList = p->access; + checklist.accessList = cbdataReference(p->access); #if 0 && USE_IDENT /* Index: squid3/src/snmp_core.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/snmp_core.cc,v retrieving revision 1.10.8.3 retrieving revision 1.10.8.4 diff -u -r1.10.8.3 -r1.10.8.4 --- squid3/src/snmp_core.cc 1 Jun 2005 16:57:54 -0000 1.10.8.3 +++ squid3/src/snmp_core.cc 16 Jun 2005 10:33:25 -0000 1.10.8.4 @@ -1,6 +1,6 @@ /* - * $Id: snmp_core.cc,v 1.10.8.3 2005/06/01 16:57:54 rmartinez Exp $ + * $Id: snmp_core.cc,v 1.10.8.4 2005/06/16 10:33:25 rmartinez Exp $ * * DEBUG: section 49 SNMP support * AUTHOR: Glenn Chisholm @@ -540,12 +540,12 @@ ACLChecklist checklist; checklist.src_addr = rq->from.sin_addr; checklist.snmp_community = (char *) Community; - checklist.accessList = Config.accessList.snmp; - if (Community) + if (Community) { + checklist.accessList = cbdataReference(Config.accessList.snmp); allow = checklist.fastCheck(); - - checklist.accessList = NULL; + checklist.accessList = NULL; + } if ((snmp_coexist_V2toV1(PDU)) && (Community) && (allow)) { rq->community = Community; Index: squid3/src/tunnel.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/tunnel.cc,v retrieving revision 1.13.4.1 retrieving revision 1.13.4.2 diff -u -r1.13.4.1 -r1.13.4.2 --- squid3/src/tunnel.cc 5 May 2005 09:22:44 -0000 1.13.4.1 +++ squid3/src/tunnel.cc 16 Jun 2005 10:33:52 -0000 1.13.4.2 @@ -1,6 +1,6 @@ /* - * $Id: tunnel.cc,v 1.13.4.1 2005/05/05 09:22:44 rmartinez Exp $ + * $Id: tunnel.cc,v 1.13.4.2 2005/06/16 10:33:52 rmartinez Exp $ * * DEBUG: section 26 Secure Sockets Layer Proxy * AUTHOR: Duane Wessels @@ -602,7 +602,7 @@ ch.my_addr = request->my_addr; ch.my_port = request->my_port; ch.request = requestLink(request); - ch.accessList = Config.accessList.miss; + ch.accessList = cbdataReference(Config.accessList.miss); answer = ch.fastCheck(); ch.accessList = NULL;