Index: squid/lib/splay.c diff -c squid/lib/splay.c:1.12 squid/lib/splay.c:1.12.4.1 *** squid/lib/splay.c:1.12 Sun Oct 3 23:04:52 1999 --- squid/lib/splay.c Thu Jan 15 00:38:35 2004 *************** *** 53,60 **** splayNode *l; splayNode *r; splayNode *y; ! if (top == NULL) return top; N.left = N.right = NULL; l = r = &N; --- 53,62 ---- splayNode *l; splayNode *r; splayNode *y; ! if (top == NULL) { ! splayLastResult = -1; return top; + } N.left = N.right = NULL; l = r = &N; Index: squid/src/acl.c diff -c squid/src/acl.c:1.270.2.19 squid/src/acl.c:1.270.2.21 *** squid/src/acl.c:1.270.2.19 Fri Dec 19 09:34:22 2003 --- squid/src/acl.c Thu Jan 15 00:43:57 2004 *************** *** 626,650 **** splayNode *Top = NULL; debug(28, 2) ("aclParseUserList: parsing user list\n"); if (*current == NULL) { debug(28, 3) ("aclParseUserList: current is null. Creating\n"); *current = memAllocate(MEM_ACL_USER_DATA); } data = *current; Top = data->names; ! if ((t = strtokFile())) { ! debug(28, 5) ("aclParseUserList: First token is %s\n", t); ! if (strcmp("-i", t) == 0) { ! debug(28, 5) ("aclParseUserList: Going case-insensitive\n"); ! data->flags.case_insensitive = 1; ! } else if (strcmp("REQUIRED", t) == 0) { ! debug(28, 5) ("aclParseUserList: REQUIRED-type enabled\n"); ! data->flags.required = 1; ! } else { ! if (data->flags.case_insensitive) ! Tolower(t); ! Top = splay_insert(xstrdup(t), Top, (SPLAYCMP *) strcmp); ! } } debug(28, 3) ("aclParseUserList: Case-insensitive-switch is %d\n", data->flags.case_insensitive); --- 626,653 ---- splayNode *Top = NULL; debug(28, 2) ("aclParseUserList: parsing user list\n"); + t = strtokFile(); + if (!t) { + debug(28, 2) ("aclParseUserList: No data defined\n"); + return; + } + debug(28, 5) ("aclParseUserList: First token is %s\n", t); if (*current == NULL) { debug(28, 3) ("aclParseUserList: current is null. Creating\n"); *current = memAllocate(MEM_ACL_USER_DATA); } data = *current; Top = data->names; ! if (strcmp("-i", t) == 0) { ! debug(28, 5) ("aclParseUserList: Going case-insensitive\n"); ! data->flags.case_insensitive = 1; ! } else if (strcmp("REQUIRED", t) == 0) { ! debug(28, 5) ("aclParseUserList: REQUIRED-type enabled\n"); ! data->flags.required = 1; ! } else { ! if (data->flags.case_insensitive) ! Tolower(t); ! Top = splay_insert(xstrdup(t), Top, (SPLAYCMP *) strcmp); } debug(28, 3) ("aclParseUserList: Case-insensitive-switch is %d\n", data->flags.case_insensitive);

AltStyle によって変換されたページ (->オリジナル) /