From: Nathan Hoad <nathan@getoffmalawn.com>
Date: Sun, 14 Jul 2013 03:03:53 +0000 (-0600)
Subject: Fix external ACL user:pass detail logging after adaptation
X-Git-Tag: SQUID_3_4_0_1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d27929a84fb78468fe82139d2a96e55b32300dd6;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 0360807815..b718c87f8b 100644
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -227,10 +227,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;
 
@@ -270,6 +266,8 @@ HttpRequest::inheritProperties(const HttpMsg *aMsg)
     errDetail = aReq->errDetail;
 #if USE_AUTH
     auth_user_request = aReq->auth_user_request;
+    copy->extacl_user = extacl_user;
+    copy->extacl_passwd = extacl_passwd;
 #endif
 
     // main property is which connection the request was received on (if any)