Index: squid/src/acl.c diff -u squid/src/acl.c:1.1.1.36.2.1 squid/src/acl.c:1.1.1.36.2.2 --- squid/src/acl.c:1.1.1.36.2.1 Sat Aug 7 18:14:53 1999 +++ squid/src/acl.c Sat Aug 7 19:20:10 1999 @@ -993,18 +993,20 @@ { char *sent_auth; char *cleartext; - debug(28, 6) ("aclDecodeProxyAuth: header = '%s'\n", proxy_auth); if (proxy_auth == NULL) return 0; - if (strlen(proxy_auth) < SKIP_BASIC_SZ) + debug(28, 6) ("aclDecodeProxyAuth: header = '%s'\n", proxy_auth); + if (strncasecmp(proxy_auth,"Basic ",6) != 0) { + debug(28, 1) ("aclDecodeProxyAuth: Unsupported proxy-auth sheme, '%s'\n", proxy_auth); return 0; - proxy_auth += SKIP_BASIC_SZ; - sent_auth = xstrdup(proxy_auth); /* username and password */ - /* Trim trailing \n before decoding */ - strtok(sent_auth, "\n"); + } + proxy_auth += 6; /* "Basic " */ /* Trim leading whitespace before decoding */ while (xisspace(*proxy_auth)) proxy_auth++; + sent_auth = xstrdup(proxy_auth); /* username and password */ + /* Trim trailing \n before decoding */ + strtok(sent_auth, "\n"); cleartext = uudecode(sent_auth); xfree(sent_auth); debug(28, 6) ("aclDecodeProxyAuth: cleartext = '%s'\n", cleartext); Index: squid/src/defines.h diff -u squid/src/defines.h:1.1.1.26 squid/src/defines.h:1.1.1.26.2.1 --- squid/src/defines.h:1.1.1.26 Sat Aug 7 17:13:20 1999 +++ squid/src/defines.h Sat Aug 7 19:20:11 1999 @@ -206,8 +206,6 @@ #define STORE_ENTRY_WITH_MEMOBJ 1 #define STORE_ENTRY_WITHOUT_MEMOBJ 0 -#define SKIP_BASIC_SZ ((size_t) 6) - #define PINGER_PAYLOAD_SZ 8192 #define COUNT_INTERVAL 60