]>
Commit | Line | Data |
---|---|---|
d3969417 AM |
1 | Index: squid/src/acl.c |
2 | diff -c squid/src/acl.c:1.270.2.10 squid/src/acl.c:1.270.2.12 | |
3 | *** squid/src/acl.c:1.270.2.10 Mon Oct 7 21:33:52 2002 | |
4 | --- squid/src/acl.c Sat Nov 9 20:57:03 2002 | |
5 | *************** | |
6 | *** 1745,1750 **** | |
7 | --- 1745,1751 ---- | |
8 | */ | |
9 | if (!cbdataValid(A)) { | |
10 | cbdataUnlock(A); | |
11 | + checklist->access_list = NULL; | |
12 | break; | |
13 | } | |
14 | debug(28, 3) ("aclCheck: checking '%s'\n", A->cfgline); | |
15 | *************** | |
16 | *** 1818,1826 **** | |
17 | * is allowed, denied, requires authentication, or we move on to | |
18 | * the next entry. | |
19 | */ | |
20 | - cbdataUnlock(A); | |
21 | if (match) { | |
22 | debug(28, 3) ("aclCheck: match found, returning %d\n", allow); | |
23 | aclCheckCallback(checklist, allow); | |
24 | return; | |
25 | } | |
26 | --- 1819,1828 ---- | |
27 | * is allowed, denied, requires authentication, or we move on to | |
28 | * the next entry. | |
29 | */ | |
30 | if (match) { | |
31 | debug(28, 3) ("aclCheck: match found, returning %d\n", allow); | |
32 | + cbdataUnlock(A); | |
33 | + checklist->access_list = NULL; | |
34 | aclCheckCallback(checklist, allow); | |
35 | return; | |
36 | } | |
37 | *************** | |
38 | *** 1830,1835 **** | |
39 | --- 1832,1838 ---- | |
40 | */ | |
41 | if (A->next) | |
42 | cbdataLock(A->next); | |
43 | + cbdataUnlock(A); | |
44 | } | |
45 | debug(28, 3) ("aclCheck: NO match found, returning %d\n", allow != ACCESS_DENIED ? ACCESS_DENIED : ACCESS_ALLOWED); | |
46 | aclCheckCallback(checklist, allow != ACCESS_DENIED ? ACCESS_DENIED : ACCESS_ALLOWED); | |
47 | *************** | |
48 | *** 1844,1849 **** | |
49 | --- 1847,1856 ---- | |
50 | if (checklist->conn) { | |
51 | cbdataUnlock(checklist->conn); | |
52 | checklist->conn = NULL; | |
53 | + } | |
54 | + if (checklist->access_list) { | |
55 | + cbdataUnlock(checklist->access_list); | |
56 | + checklist->access_list = NULL; | |
57 | } | |
58 | aclCheckCleanup(checklist); | |
59 | cbdataFree(checklist); |