# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: minijb@gmail.com-20110323025611-h51qjjocytsqvvvu
# target_branch: file:///C:/Users/jamesbowe/My%20Work/getbusi\
#   /workspace/projects/squid-development/trunk/
# testament_sha1: 6c204db44ea4b784f5b74b4e538e47bd114c2b3c
# timestamp: 2011-03-23 13:57:02 +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-23 02:56:11 +0000
@@ -187,6 +187,8 @@
 #if USE_AUTH
         EXT_ACL_EXT_USER,
 #endif
+        EXT_ACL_EXT_LOG,
+        EXT_ACL_TAG,
         EXT_ACL_END
     } type;
     external_acl_format *next;
@@ -464,6 +466,10 @@
         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 if (strcmp(token, "%TAG") == 0)
+            format->type = _external_acl_format::EXT_ACL_TAG;
         else {
             debugs(0,0, "ERROR: Unknown Format token " << token);
             self_destruct();
@@ -1068,6 +1074,12 @@
             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_TAG:
+            str = request->tag.termedBuf();
+            break;
         case _external_acl_format::EXT_ACL_UNKNOWN:
 
         case _external_acl_format::EXT_ACL_END:

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdm9nesAA1JfgARQU2f//3qU
hEC////wUAYYXtAABIKAAA1TJoEaDED1GRtTTCDRoZMJkGOaYmABMAEwAAmAAJgkU1Gqn6pnon6U
ZNPU9RpNqeoDGhqGJjCg5piYAEwATAACYAAmBUogI0AETAp4RhDU2k1PTRNqbFIBctHkwLxmMkeX
vlb3GYkM4CZyHQbPC0VgMXGMwzuyIdSQdF3HLOVDiyWeudJ5QQWAsp7+NCmswDWYhibbWk9fIWas
sGrpEigwbrHEiCCqT55O0xnMbCLW7SvPUYo/uouN5MyQQMmzgGMxACMKpgAp9liEAw1A4fGg1RIF
1VipnG4Zw2EklFHXKtQv3Up91XFSf+YNt73tDpbjan6NAbW9cwZBaRK9mwpVG0UwYg+QbTKF/PrO
Tr0SlKA17aYjzolijYpPB2G1QjhZcW1lEwRvIs7GBWWV6qsNKuKzNkvVaC/vaHjmeyerZIyqz5kx
oRcZtaaSL9DXErh02dW12LGx9WlNKLLH+mT2reL6amZ58VS84rc5tmSb8GXGzESkbIlKM8Siqpol
hxsTeqWSxnY3LJgmCMF2dmZ2aXyblWtepmRoLVL1lU4KNDNvsLomJRMFk4rrFijFpcFiZ73Fk1Gx
cwWtkxRk01rRLWTFsjwprb3Bna2TP2zY4nDaUsd7XszmecGDJ8qOdNzVNjkc97LHJLeRVHFzSxmN
6x1rcm3dTamyxTBNfIcqjJw1XMzdutZsnJG5+DWucUYZLdS5GiXY21bVZkt2NWrAtzsWOpNyq1e0
MF1m1pYflb0rFVMnItX4rVOFVaMNKks0teuxYzudHUnWk1ZccKJxcKcGUuUwYNlhY0LVza2NrRgu
xYMm55LbzxN5mYUlDMl2RrRd2s792c9UsUJ81D0fse1zmBtOdYcZ40UpGDpfyd75rGCpgoqseRzo
dB+R+I3t7GlEpPvqa3+C37djFWr+2UT3DbbbZQhLYBuSmQt6SxpKgFaGk1qBUBouOUWBJKIM3jWX
jK4AzGgZ9zSQaj0td2+RlSyV0nbJ9EMZc2E+VD8sWD98ifwzpPX0TY0qPB833Qo5FH07n+ueeZNT
n3Kldz+rGt9XvfZPq/vi6HT1aKqRNTFI9r/Evne3a0crOeq9oi9KP6XItXvk6GLXOk4naa6fpR7n
koo3OjH6u9Zz21ojg83gfc48x5NK2Tg3u/rb6tD6y0dYoNB6mMKj7CYLqndQvYliAtJgxyKOBmC8
+tHk+yj3ehTFnbGT2vg5HUVcrmeDomZV+yOs0R93k2OWjdSfFUqfZ4+RMp+kOw/TkeM/6le4fGZb
Edl6Mx3NzrNyOTA3sDTghuQvS8v8JNHYh+PYsXNweIXqvf7OhDgVJqn4T2JunzWulySem9emSGlP
cjElslqV5mOrtdba0oWu5DqSZiijyczQflY8ynbKKynMybWZeY2taiTInQXrpLVxXUoh4IsFaItq
n8Hb26DpTRwtWkYB6Mr4Yr5KJPRVMv+Nz40bpwcrilp/M68wydTFiUdB2J4o5mZGbYpZ0UfSckqt
k3MGCqh2MSb2p4qtaiWM9+dJVJjZtFtpSh0VSpcUU0GS5xjE5wovTK39qLEqzCyT4vNfZndNGhRg
UOVpVOR7Y9cFWp3Kk0GLdoLI1MZM6UPQrF1E6k4PNFpx1vgnxxvdyh3tD1fC9PYGYmCbnZOWTXSe
h+6MZC1ao+Sqqk96ZHTxmD1n/xdyRThQkNm9nes=