Documentation for several ACL types (#189)

These ACL types have been available for some time but have not
yet had a mention in the squid.conf docs.

diff --git a/src/cf.data.pre b/src/cf.data.pre
index af20ed8b7c6ce892e0e9bc3bbacb32533fd97f3a..3a4f7383ac875b8645da93231f2224aab688b76e 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -904,18 +904,27 @@ DOC_START
        acl aclname dst [-n] ip-address/mask ...        # URL host's IP address [slow]
        acl aclname localip ip-address/mask ... # IP address the client connected to [fast]
 
-       acl aclname arp      mac-address ... (xx:xx:xx:xx:xx:xx notation)
+if USE_SQUID_EUI
+       acl aclname arp      mac-address ...
+       acl aclname eui64    eui64-address ...
          # [fast]
+         # MAC (EUI-48) and EUI-64 addresses use xx:xx:xx:xx:xx:xx notation.
+         #
          # The 'arp' ACL code is not portable to all operating systems.
          # It works on Linux, Solaris, Windows, FreeBSD, and some other
          # BSD variants.
          #
-         # NOTE: Squid can only determine the MAC/EUI address for IPv4
+         # The eui_lookup directive is required to be 'on' (the default)
+         # and Squid built with --enable-eui for MAC/EUI addresses to be
+         # available for this ACL.
+         #
+         # Squid can only determine the MAC/EUI address for IPv4
          # clients that are on the same subnet. If the client is on a
          # different subnet, then Squid cannot find out its address.
          #
-         # NOTE 2: IPv6 protocol does not contain ARP. MAC/EUI is either
+         # IPv6 protocol does not contain ARP. MAC/EUI is either
          # encoded directly in the IPv6 address or not available.
+endif
 
        acl aclname srcdomain   .foo.com ...
          # reverse lookup, from client IP [slow]
@@ -942,6 +951,7 @@ DOC_START
          # cache_peer_access mycache_mydomain.net deny all
 
        acl aclname peername myPeer ...
+       acl aclname peername_regex [-i] regex-pattern ...
          # [fast]
          # match against a named cache_peer entry
          # set unique name= on cache_peer lines for reliable use.