------------------------------------------------------------ revno: 12596 revision-id: squid3@treenet.co.nz-20130726114748-i7l2deukqpkeyp9d parent: squid3@treenet.co.nz-20130726114037-2755jhbd13je7zvi author: Nathan Hoad committer: Amos Jeffries branch nick: 3.3 timestamp: Fri 2013-07-26 05:47:48 -0600 message: Fix external ACL user:pass detail logging after adaptation When a request is successfully adapted, the external ACL username and password are now inherited with this patch. This means the LFT_USER_NAME log token can display the username from an external ACL if available, for adapted requests. The HttpRequest will inherit the password for good measure as well - while none too useful, it seems strange to inherit the username but not the password. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130726114748-i7l2deukqpkeyp9d # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 0441c836d499c12ef9df40eff10181b33d4a1570 # timestamp: 2013-07-26 11:54:34 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20130726114037-\ # 2755jhbd13je7zvi # # Begin patch === modified file 'src/HttpRequest.cc' --- src/HttpRequest.cc 2013-07-26 11:40:37 +0000 +++ src/HttpRequest.cc 2013-07-26 11:47:48 +0000 @@ -222,10 +222,6 @@ copy->myportname = myportname; copy->tag = tag; -#if USE_AUTH - copy->extacl_user = extacl_user; - copy->extacl_passwd = extacl_passwd; -#endif copy->extacl_log = extacl_log; copy->extacl_message = extacl_message; @@ -265,6 +261,8 @@ errDetail = aReq->errDetail; #if USE_AUTH auth_user_request = aReq->auth_user_request; + extacl_user = aReq->extacl_user; + extacl_passwd = aReq->extacl_passwd; #endif // main property is which connection the request was received on (if any)