1 Index: squid/include/config.h
2 diff -c squid/include/config.h:1.4 squid/include/config.h:1.4.2.1
3 *** squid/include/config.h:1.4 Tue Nov 13 14:27:47 2001
4 --- squid/include/config.h Sat Apr 17 19:29:51 2004
8 #define xisascii(x) isascii((unsigned char)x)
9 #define xislower(x) islower((unsigned char)x)
10 #define xisalpha(x) isalpha((unsigned char)x)
11 + #define xisgraph(x) isgraph((unsigned char)x)
14 #define squid_random random
15 Index: squid/src/authenticate.c
16 diff -c squid/src/authenticate.c:1.36.2.14 squid/src/authenticate.c:1.36.2.15
17 *** squid/src/authenticate.c:1.36.2.14 Wed Feb 18 11:51:16 2004
18 --- squid/src/authenticate.c Sat Apr 17 19:29:51 2004
21 /* we're configured to use this scheme - but is it active ? */
22 if ((i = authenticateAuthSchemeId(proxy_auth)) != -1) {
23 authscheme_list[i].decodeauth(auth_user_request, proxy_auth);
24 ! auth_user_request->auth_user->auth_module = i + 1;
29 /* we're configured to use this scheme - but is it active ? */
30 if ((i = authenticateAuthSchemeId(proxy_auth)) != -1) {
31 authscheme_list[i].decodeauth(auth_user_request, proxy_auth);
32 ! if (auth_user_request->auth_user) {
33 ! auth_user_request->auth_user->auth_module = i + 1;
35 ! debug(29, 1) ("authenticateDecodeAuth: Invalid proxy-auth header, '%s'\n", proxy_auth);
40 Index: squid/src/auth/basic/auth_basic.c
41 diff -c squid/src/auth/basic/auth_basic.c:1.14.2.5 squid/src/auth/basic/auth_basic.c:1.14.2.6
42 *** squid/src/auth/basic/auth_basic.c:1.14.2.5 Wed Feb 18 10:50:51 2004
43 --- squid/src/auth/basic/auth_basic.c Sat Apr 17 19:29:52 2004
47 /* decode the username */
48 /* trim BASIC from string */
49 ! while (!xisspace(*proxy_auth))
52 local_basic.passwd = NULL;
55 /* decode the username */
56 /* trim BASIC from string */
57 ! while (xisgraph(*proxy_auth))
60 local_basic.passwd = NULL;
61 Index: squid/src/auth/digest/auth_digest.c
62 diff -c squid/src/auth/digest/auth_digest.c:1.10.2.11 squid/src/auth/digest/auth_digest.c:1.10.2.12
63 *** squid/src/auth/digest/auth_digest.c:1.10.2.11 Thu Feb 19 05:28:01 2004
64 --- squid/src/auth/digest/auth_digest.c Sat Apr 17 19:29:52 2004
67 authenticateDigestDirection(auth_user_request_t * auth_user_request)
69 digest_request_h *digest_request = auth_user_request->scheme_data;
70 ! /* null auth_user is checked for by authenticateDirection */
71 switch (digest_request->flags.credentials_ok) {
72 case 0: /* not checked */
75 authenticateDigestDirection(auth_user_request_t * auth_user_request)
77 digest_request_h *digest_request = auth_user_request->scheme_data;
78 ! if (!digest_request)
80 switch (digest_request->flags.credentials_ok) {
81 case 0: /* not checked */
86 if (!auth_user_request)
88 digest_request = auth_user_request->scheme_data;
89 + if (!digest_request)
91 /* don't add to authentication error pages */
92 if ((!accel && rep->sline.status == HTTP_PROXY_AUTHENTICATION_REQUIRED)
93 || (accel && rep->sline.status == HTTP_UNAUTHORIZED))
96 digest_request = authDigestRequestNew();
98 /* trim DIGEST from string */
99 ! while (!xisspace(*proxy_auth))
102 /* Trim leading whitespace before decoding */
104 digest_request = authDigestRequestNew();
106 /* trim DIGEST from string */
107 ! while (xisgraph(*proxy_auth))
110 /* Trim leading whitespace before decoding */
111 Index: squid/src/auth/ntlm/auth_ntlm.c
112 diff -c squid/src/auth/ntlm/auth_ntlm.c:1.17.2.11 squid/src/auth/ntlm/auth_ntlm.c:1.17.2.12
113 *** squid/src/auth/ntlm/auth_ntlm.c:1.17.2.11 Tue Apr 6 08:06:32 2004
114 --- squid/src/auth/ntlm/auth_ntlm.c Sat Apr 17 19:29:52 2004
117 fatal("Invalid authenticate state for NTLMStart");
120 ! while (!xisspace(*sent_string)) /*trim NTLM */
123 while (xisspace(*sent_string)) /*trim leading spaces */
125 fatal("Invalid authenticate state for NTLMStart");
128 ! while (xisgraph(*sent_string)) /*trim NTLM */
131 while (xisspace(*sent_string)) /*trim leading spaces */