--------------------- PatchSet 1973 Date: 2005/10/23 11:19:26 Author: hno Branch: negotiate Tag: (none) Log: Bug #1391: FATAL: Incorrect scheme in auth header fix of forward ported patch.. squid-3 has too many layers on the schemes making it easy to get lost.. Members: src/AuthUserRequest.cc:1.7.2.1->1.7.2.2 Index: squid3/src/AuthUserRequest.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/AuthUserRequest.cc,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -u -r1.7.2.1 -r1.7.2.2 --- squid3/src/AuthUserRequest.cc 22 Oct 2005 18:30:58 -0000 1.7.2.1 +++ squid3/src/AuthUserRequest.cc 23 Oct 2005 11:19:26 -0000 1.7.2.2 @@ -1,6 +1,6 @@ /* - * $Id: AuthUserRequest.cc,v 1.7.2.1 2005/10/22 18:30:58 hno Exp $ + * $Id: AuthUserRequest.cc,v 1.7.2.2 2005/10/23 11:19:26 hno Exp $ * * DO NOT MODIFY NEXT 2 LINES: * arch-tag: 6803fde1-d5a2-4c29-9034-1c0c9f650eb4 @@ -479,9 +479,9 @@ conn.getRaw() != NULL ? conn->fd : -1); if (proxy_auth && !request->auth_user_request && conn.getRaw() && conn->auth_user_request) { - AuthScheme * id = AuthScheme::Find(proxy_auth); + AuthConfig * scheme = AuthConfig::Find(proxy_auth); - if (!conn->auth_user_request->user() || AuthScheme::Find(conn->auth_user_request->user()->config->type()) != id) { + if (!conn->auth_user_request->user() || conn->auth_user_request->user()->config != scheme) { debug(28, 1) ("authenticateAuthenticate: Unexpected change of authentication scheme from '%s' to '%s' (client %s)\n", conn->auth_user_request->user()->config->type(), proxy_auth, inet_ntoa(src_addr)); conn->auth_user_request->unlock();