# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: minijb@gmail.com-20110322125703-i8je8fd13xl6nqtx
# target_branch: file:///C:/Users/jamesbowe/My%20Work/getbusi\
#   /workspace/projects/squid-development/trunk/
# testament_sha1: 76acc29362f1c018d703597128e3c30008b29b9b
# timestamp: 2011-03-22 23:58:47 +1100
# base_revision_id: squid3@treenet.co.nz-20110322122325-\
#   3hbwr8gfajh0zr8j
# 
# Begin patch
=== modified file 'src/external_acl.cc'
--- src/external_acl.cc	2011-03-02 07:27:24 +0000
+++ src/external_acl.cc	2011-03-22 12:57:03 +0000
@@ -187,6 +187,7 @@
 #if USE_AUTH
         EXT_ACL_EXT_USER,
 #endif
+        EXT_ACL_EXT_LOG,
         EXT_ACL_END
     } type;
     external_acl_format *next;
@@ -464,6 +465,8 @@
         else if (strcmp(token, "%EXT_USER") == 0)
             format->type = _external_acl_format::EXT_ACL_EXT_USER;
 #endif
+        else if (strcmp(token, "%EXT_LOG") == 0)
+            format->type = _external_acl_format::EXT_ACL_EXT_LOG;
         else {
             debugs(0,0, "ERROR: Unknown Format token " << token);
             self_destruct();
@@ -1068,6 +1071,9 @@
             str = request->extacl_user.termedBuf();
             break;
 #endif
+        case _external_acl_format::EXT_ACL_EXT_LOG:
+            str = request->extacl_log.termedBuf();
+            break;
         case _external_acl_format::EXT_ACL_UNKNOWN:
 
         case _external_acl_format::EXT_ACL_END:

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT1hjyAAAbTfgARQU2f//3qU
hEC////wUAPe7LTjdQVe9l7YSSImj1MmFT09GqbNEyMkPRPRknpqeKemoJSNSbIPUCn6p6E0B6gA
AaAABIkFNTyT01T1MyajJ6nqZo0JjQJpk9IAyoahtTQ0AxNMEBk0GjIAZGEkkYTSTGRlT2qflT9K
aHpB+qGRp6Q00eoUCvMcG1O8Lehc5rn2Y/OaiMtjcIZUUiMNmVDRxfrtEFRZfa+/bnO61ps1fnyW
6ljG8rHOHEcpF2PNulddxvl+dlH1H/HvaVoMvtG4L2Pjmd3V254vCJq8lU6UVmF6COfk6pjnJgue
d+ziTrsEoqKVWaANLc53dFGDJZg6YTH3/D66pBvlQ2NYO9mv6GDERMlBUWkRGmpJ8cYol0ysf6js
geZduwTQEOITEakFeLreLqySkL7HueEzZlIxGSdTGqX0BNXIG8SBxBkUjhyDIU8M0KoqEt7e4cSq
DL6O4VpN0lqJFwySCpSSxMFFgVipHNKQKMWJOJRW54UFpanFYYEWYwOMypqnGS/ssyTOS0wEvmGN
1m0BVn2CREuqgX3rprNlLj7LSQkLVtoEg/MSHlJNcM0CgiRZFJqaNC/sTbU9map1QxwFkLMCUbAs
OqVRAhvpHUmrWOpka3XTUVEtxSKO6SpR+EPSB+09hbWNmU0VkhSVvMWtgjjzOvuoi4izqOw9qWQd
AthayY8erX+Qp58SX3Jh0FO4XIOguojAI6g8GFsFQMU1rvcD34veOxo3hoMZwvGalF1nqBaG5L2U
WAXox1vSbr4veCW3YUkxyS3G63piXkKXbQ4dQfLyU3nnwW8+rPvBmSluJGjIcCiYV0PUgokz0XKz
10kkysKi05N2bTqZrm8rclRr8TmVdxqhEFJQZ++2KGWJDy3jMEXimFHPgwslcFeQxc28KgIH1bl4
NoeuU9tfI5lxgnnifAXoKjnrmwsv1QOOHlqFfXZLKdtGpNmD8KE6Mv9FeM5VkC1EC2A9KxK9PH+w
K80unCh9gHICDvfwxS3DgF45RzVdxgS4BZKSWDpBXBQAgqtL3IXmbpKIiXSUjevPjP7I5081uFmk
snkaVwtBWgToEXtL7ikEMily+gceOoK91FAEANJwRGAMloOU++zRrDdfvVJzJBMxIxGwOQr8wlsw
pO5XJzwsjFzBnIWXf1xe1K2tqUJWSwCcxs+UKCg3jLqcCsNADqi7jh0QeHTy2LTqdW6AOMWeY5JO
5t54lRC+oVGiFSY0Byeyt/oqDd26Qf6WDrmd/ugrwNuauFr0PkKoiU33RDLA0fErtX/F3JFOFCQP
WGPIAA==