From: Jorge Ivan Burgos Aguilar <jorgeivanburgosaguilar@gmail.com>
Date: Wed, 26 Nov 2014 10:23:03 +0000 (-0800)
Subject: Bug 4148: external_acl_type header format does not accept the new libformat syntax
X-Git-Tag: merge-candidate-3-v1~470
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=616ae5ee76975f3cabb0a3c7821cc56a9ba5ed7f;p=thirdparty%2Fsquid.git

Bug 4148: external_acl_type header format does not accept the new libformat syntax
---

diff --git a/src/external_acl.cc b/src/external_acl.cc
index b718f10e88..9339464795 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -340,12 +340,12 @@ parse_externalAclHelper(external_acl ** list)
             debugs(82, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: external_acl_type format %>{...} is being replaced by %>ha{...} for : " << token);
             parse_header_token(format, (token+3), Format::LFT_ADAPTED_REQUEST_HEADER);
         } else if (strncmp(token, "%>ha{", 5) == 0) {
-            parse_header_token(format, (token+3), Format::LFT_ADAPTED_REQUEST_HEADER);
+            parse_header_token(format, (token+5), Format::LFT_ADAPTED_REQUEST_HEADER);
         } else if (strncmp(token, "%<{", 3) == 0) {
             debugs(82, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: external_acl_type format %<{...} is being replaced by %<h{...} for : " << token);
             parse_header_token(format, (token+3), Format::LFT_REPLY_HEADER);
         } else if (strncmp(token, "%<h{", 4) == 0) {
-            parse_header_token(format, (token+3), Format::LFT_REPLY_HEADER);
+            parse_header_token(format, (token+4), Format::LFT_REPLY_HEADER);
 #if USE_AUTH
         } else if (strcmp(token, "%LOGIN") == 0 || strcmp(token, "%ul") == 0) {
             format->type = Format::LFT_USER_LOGIN;