From: hno <>
Date: Fri, 20 Jun 2003 00:05:11 +0000 (+0000)
Subject: 2003-02-26 22:03  hno
X-Git-Tag: SQUID_3_0_PRE1~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbd2dc91e70ede3cf92be704186cbb655cfae396;p=thirdparty%2Fsquid.git

2003-02-26 22:03  hno

Bug #552: using username from external_acl for http_access and delay_access
---

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 2ee2007362..6e296aa709 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.42 2003/05/29 15:54:08 hno Exp $
+ * $Id: external_acl.cc,v 1.43 2003/06/19 18:05:11 hno Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -584,8 +584,12 @@ aclMatchExternal(external_acl_data *acl, ACLChecklist * ch)
      * Register the username for logging purposes
      */
 
-    if (entry->user && cbdataReferenceValid(ch->conn()) && !ch->conn()->rfc931[0])
-        xstrncpy(ch->conn()->rfc931, entry->user, USER_IDENT_SZ);
+    if (entry->user) {
+        xstrncpy(ch->rfc931, entry->user, USER_IDENT_SZ);
+
+        if (cbdataReferenceValid(ch->conn()))
+            xstrncpy(ch->conn()->rfc931, entry->user, USER_IDENT_SZ);
+    }
 
     if (ch->request && !ch->request->tag.size())
         ch->request->tag = entry->tag;