From: Nathan Hoad <nathan@getoffmalawn.com>
Date: Fri, 26 Jul 2013 11:47:48 +0000 (-0600)
Subject: Fix external ACL user:pass detail logging after adaptation
X-Git-Tag: SQUID_3_3_10~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a66a0488cf6a6de768c0c7f014afdf9cb74e4c1;p=thirdparty%2Fsquid.git

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.
---

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index 94504d51d4..8f067e9457 100644
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -222,10 +222,6 @@ HttpRequest::clone() const
 
     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 @@ HttpRequest::inheritProperties(const HttpMsg *aMsg)
     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)