From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 12 Jan 2015 15:55:56 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: merge-candidate-3-v1~345^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a0c57ce48a14aa241ccd4c478b7724b71295afe;p=thirdparty%2Fsquid.git

Merged from trunk
---

3a0c57ce48a14aa241ccd4c478b7724b71295afe
diff --cc src/acl/UserData.cc
index bd1b7e0875,8d1e1fa24f..7ae43ae9c6
--- a/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@@ -44,16 -80,24 +44,17 @@@ ACLUserData::dump() cons
  {
      SBufList sl;
  
-     if (flags.case_insensitive)
-         sl.push_back(SBuf("-i"));
- 
      if (flags.required) {
          sl.push_back(SBuf("REQUIRED"));
-     } else {
-         sl.insert(sl.end(), userDataNames.begin(), userDataNames.end());
+         return sl;
      }
  
+     if (flags.case_insensitive)
+         sl.push_back(SBuf("-i"));
+ 
 -    /* damn this is VERY inefficient for long ACL lists... filling
 -     * a SBufList this way costs Sum(1,N) iterations. For instance
 -     * a 1000-elements list will be filled in 499500 iterations.
 -     */
 -    if (names) {
 -        UserDataAclDumpVisitor visitor;
 -        names->visit(visitor);
 -        sl.splice(sl.end(),visitor.contents);
 -    }
++    sl.insert(sl.end(), userDataNames.begin(), userDataNames.end());
+ 
 +    debugs(28,5, "ACLUserData dump output: " << SBufContainerJoin(userDataNames,SBuf(" ")));
      return sl;
  }