# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: minijb@gmail.com-20110323055346-gk9zzzml89a12h5d
# target_branch: file:///C:/Users/jamesbowe/My%20Work/getbusi\
#   /workspace/projects/squid-development/trunk/
# testament_sha1: 865335287696e8e0d813f75d4068569ac2a38e3a
# timestamp: 2011-03-23 16:54:41 +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 05:53:46 +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();
@@ -602,6 +608,8 @@
 #if USE_AUTH
                 DUMP_EXT_ACL_TYPE(EXT_USER);
 #endif
+                DUMP_EXT_ACL_TYPE(EXT_LOG);
+                DUMP_EXT_ACL_TYPE(TAG);
             default:
                 fatal("unknown external_acl format error");
                 break;
@@ -1068,6 +1076,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
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