From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 9 Aug 2015 14:57:22 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: SQUID_4_0_1~5^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce810e3390cfb83d47b8c4815b665280e19be396;p=thirdparty%2Fsquid.git

Merge from trunk
---

ce810e3390cfb83d47b8c4815b665280e19be396
diff --cc src/format/ByteCode.h
index 6b170b313f,6b170b313f..bad01c3e3d
--- a/src/format/ByteCode.h
+++ b/src/format/ByteCode.h
@@@ -223,10 -223,10 +223,12 @@@ typedef enum 
      LFT_PERCENT,            /* special string cases for escaped chars */
  
      // TODO assign better bytecode names and Token strings for these
++#if USE_OPENSSL
      LFT_EXT_ACL_USER_CERT_RAW,
      LFT_EXT_ACL_USER_CERTCHAIN_RAW,
      LFT_EXT_ACL_USER_CERT,
      LFT_EXT_ACL_USER_CA_CERT,
++#endif
      LFT_EXT_ACL_CLIENT_EUI48,
      LFT_EXT_ACL_CLIENT_EUI64,
      LFT_EXT_ACL_NAME,
diff --cc src/format/Token.cc
index 85e7cb54ec,8e0b31b49e..d898498490
--- a/src/format/Token.cc
+++ b/src/format/Token.cc
@@@ -145,30 -145,6 +145,32 @@@ static TokenTableEntry TokenTableMisc[
      TokenTableEntry("err_detail", LFT_SQUID_ERROR_DETAIL ),
      TokenTableEntry("note", LFT_NOTE ),
      TokenTableEntry("credentials", LFT_CREDENTIALS),
 +    /*
 +     * Legacy external_acl_type format tokens
 +     */
 +    TokenTableEntry("ACL", LFT_EXT_ACL_NAME),
 +    TokenTableEntry("DATA", LFT_EXT_ACL_DATA),
 +    TokenTableEntry("DST", LFT_CLIENT_REQ_URLDOMAIN),
 +    TokenTableEntry("EXT_LOG", LFT_EXT_LOG),
 +    TokenTableEntry("EXT_USER", LFT_USER_EXTERNAL),
 +    TokenTableEntry("IDENT", LFT_USER_IDENT),
 +    TokenTableEntry("LOGIN", LFT_USER_LOGIN),
 +    TokenTableEntry("METHOD", LFT_CLIENT_REQ_METHOD),
 +    TokenTableEntry("MYADDR", LFT_LOCAL_LISTENING_IP),
 +    TokenTableEntry("MYPORT", LFT_LOCAL_LISTENING_PORT),
 +    TokenTableEntry("PATH", LFT_CLIENT_REQ_URLPATH),
 +    TokenTableEntry("PORT", LFT_CLIENT_REQ_URLPORT),
 +    TokenTableEntry("PROTO", LFT_CLIENT_REQ_URLSCHEME),
 +    TokenTableEntry("SRCEUI48", LFT_EXT_ACL_CLIENT_EUI48),
 +    TokenTableEntry("SRCEUI64", LFT_EXT_ACL_CLIENT_EUI64),
 +    TokenTableEntry("SRCPORT", LFT_CLIENT_PORT),
 +    TokenTableEntry("SRC", LFT_CLIENT_IP_ADDRESS), // keep after longer SRC* tokens
 +    TokenTableEntry("TAG", LFT_TAG),
 +    TokenTableEntry("URI", LFT_CLIENT_REQ_URI),
++#if USE_OPENSSL
 +    TokenTableEntry("USER_CERTCHAIN", LFT_EXT_ACL_USER_CERTCHAIN_RAW),
 +    TokenTableEntry("USER_CERT", LFT_EXT_ACL_USER_CERT_RAW),
++#endif
      TokenTableEntry(NULL, LFT_NONE)        /* this must be last */
  };