From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 5 Aug 2011 03:13:36 +0000 (-0600)
Subject: Debug enhancements for rewrite helper user
X-Git-Tag: SQUID_3_1_15~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c87e27a6de248bd2d653b8248ef4338685683e71;p=thirdparty%2Fsquid.git

Debug enhancements for rewrite helper user
---

diff --git a/src/redirect.cc b/src/redirect.cc
index 1defd11a24..a66e0ebb47 100644
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -141,21 +141,27 @@ redirectStart(ClientHttpRequest * http, RH * handler, void *data)
     else
         r->client_addr.SetNoAddr();
     r->client_ident = NULL;
-
-    if (http->request->auth_user_request)
+    if (http->request->auth_user_request != NULL) {
         r->client_ident = http->request->auth_user_request->username();
-    else if (http->request->extacl_user.defined()) {
+        debugs(61, 5, HERE << "auth-user=" << (r->client_ident?r->client_ident:"NULL"));
+    }
+
+    if (!r->client_ident && http->request->extacl_user.defined()) {
         r->client_ident = http->request->extacl_user.termedBuf();
+        debugs(61, 5, HERE << "acl-user=" << (r->client_ident?r->client_ident:"NULL"));
     }
 
     if (!r->client_ident && (conn != NULL && conn->rfc931[0]))
         r->client_ident = conn->rfc931;
+        debugs(61, 5, HERE << "ident-user=" << (r->client_ident?r->client_ident:"NULL"));
+    }
 
 #if USE_SSL
 
     if (!r->client_ident && conn != NULL)
         r->client_ident = sslGetUserEmail(fd_table[conn->fd].ssl);
-
+        debugs(61, 5, HERE << "ssl-user=" << (r->client_ident?r->client_ident:"NULL"));
+    }
 #endif
 
     if (!r->client_ident)