2 diff -c squid/src/acl.c:1.270.2.30 squid/src/acl.c:1.270.2.31
3 *** squid/src/acl.c:1.270.2.30 Wed Oct 20 17:18:36 2004
4 --- squid/src/acl.c Tue Dec 21 10:45:10 2004
8 /* assume its time-of-day spec */
9 if (sscanf(t, "%d:%d-%d:%d", &h1, &m1, &h2, &m2) < 4) {
10 ! debug(28, 0) ("%s line %d: %s\n",
11 cfg_filename, config_lineno, config_input_line);
12 - debug(28, 0) ("aclParseTimeSpec: IGNORING Bad time range\n");
13 - memFree(q, MEM_ACL_TIME_DATA);
16 q = memAllocate(MEM_ACL_TIME_DATA);
17 q->start = h1 * 60 + m1;
20 /* assume its time-of-day spec */
21 if (sscanf(t, "%d:%d-%d:%d", &h1, &m1, &h2, &m2) < 4) {
22 ! fatalf("aclParseTimeSpec: ERROR: Bad time range in"
24 cfg_filename, config_lineno, config_input_line);
26 q = memAllocate(MEM_ACL_TIME_DATA);
27 q->start = h1 * 60 + m1;
30 q->weekbits = weekbits;
32 if (q->start > q->stop) {
33 ! debug(28, 0) ("%s line %d: %s\n",
34 cfg_filename, config_lineno, config_input_line);
35 - debug(28, 0) ("aclParseTimeSpec: IGNORING Reversed time range\n");
36 - memFree(q, MEM_ACL_TIME_DATA);
40 q->weekbits = ACL_ALLWEEK;
42 q->weekbits = weekbits;
44 if (q->start > q->stop) {
45 ! fatalf("aclParseTimeSpec: ERROR: Reversed time range in"
47 cfg_filename, config_lineno, config_input_line);
50 q->weekbits = ACL_ALLWEEK;
55 if (authenticateSchemeCount() == 0) {
56 ! debug(28, 0) ("aclParseAclLine: IGNORING: Proxy Auth ACL '%s' \
57 ! because no authentication schemes were compiled.\n", A->cfgline);
58 } else if (authenticateActiveSchemeCount() == 0) {
59 ! debug(28, 0) ("aclParseAclLine: IGNORING: Proxy Auth ACL '%s' \
60 ! because no authentication schemes are fully configured.\n", A->cfgline);
62 aclParseUserList(&A->data);
65 case ACL_PROXY_AUTH_REGEX:
66 if (authenticateSchemeCount() == 0) {
67 ! debug(28, 0) ("aclParseAclLine: IGNORING: Proxy Auth ACL '%s' \
68 ! because no authentication schemes were compiled.\n", A->cfgline);
69 } else if (authenticateActiveSchemeCount() == 0) {
70 ! debug(28, 0) ("aclParseAclLine: IGNORING: Proxy Auth ACL '%s' \
71 ! because no authentication schemes are fully configured.\n", A->cfgline);
73 aclParseRegexList(&A->data);
78 if (authenticateSchemeCount() == 0) {
79 ! fatalf("Invalid Proxy Auth ACL '%s' "
80 ! "because no authentication schemes were compiled.\n", A->cfgline);
81 } else if (authenticateActiveSchemeCount() == 0) {
82 ! fatalf("Invalid Proxy Auth ACL '%s' "
83 ! "because no authentication schemes are fully configured.\n", A->cfgline);
85 aclParseUserList(&A->data);
88 case ACL_PROXY_AUTH_REGEX:
89 if (authenticateSchemeCount() == 0) {
90 ! fatalf("Invalid Proxy Auth ACL '%s' "
91 ! "because no authentication schemes were compiled.\n", A->cfgline);
92 } else if (authenticateActiveSchemeCount() == 0) {
93 ! fatalf("Invalid Proxy Auth ACL '%s' "
94 ! "because no authentication schemes are fully configured.\n", A->cfgline);
96 aclParseRegexList(&A->data);
102 if (A->data == NULL) {
103 ! debug(28, 0) ("aclParseAclLine: IGNORING invalid ACL: %s\n",
105 - memFree(A, MEM_ACL);
113 if (A->data == NULL) {
114 ! debug(28, 0) ("aclParseAclLine: WARNING: empty ACL: %s\n",
119 Index: squid/lib/splay.c
120 diff -c squid/lib/splay.c:1.12.4.1 squid/lib/splay.c:1.12.4.2
121 *** squid/lib/splay.c:1.12.4.1 Thu Jan 15 00:38:35 2004
122 --- squid/lib/splay.c Tue Dec 21 10:45:10 2004
127 splay_destroy(splayNode * top, SPLAYFREE * free_func)
132 splay_destroy(top->left, free_func);