From 09f1d6d39432affdf40324cf1da94d04e35cea0c Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Thu, 26 Jul 2012 22:31:36 -0600 Subject: [PATCH] Bug 3568: Consolidate external_acl_form config dumping a bit and add missing percent dumper. --- src/external_acl.cc | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/external_acl.cc b/src/external_acl.cc index d430364e86..ae2ce5e302 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc @@ -568,6 +568,10 @@ dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl case _external_acl_format::EXT_ACL_##a: \ storeAppendPrintf(sentry, " %%%s", #a); \ break +#define DUMP_EXT_ACL_TYPE_FMT(a, fmt, ...) \ + case _external_acl_format::EXT_ACL_##a: \ + storeAppendPrintf(sentry, fmt, ##__VA_ARGS__); \ + break #if USE_AUTH DUMP_EXT_ACL_TYPE(LOGIN); #endif @@ -592,28 +596,17 @@ dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl DUMP_EXT_ACL_TYPE(PATH); DUMP_EXT_ACL_TYPE(METHOD); #if USE_SSL - - case _external_acl_format::EXT_ACL_USER_CERT_RAW: - storeAppendPrintf(sentry, " %%USER_CERT"); - break; - - case _external_acl_format::EXT_ACL_USER_CERTCHAIN_RAW: - storeAppendPrintf(sentry, " %%USER_CERTCHAIN"); - break; - - case _external_acl_format::EXT_ACL_USER_CERT: - storeAppendPrintf(sentry, " %%USER_CERT_%s", format->header); - break; - - case _external_acl_format::EXT_ACL_CA_CERT: - storeAppendPrintf(sentry, " %%USER_CERT_%s", format->header); - break; + DUMP_EXT_ACL_TYPE_FMT(USER_CERT_RAW, " %%USER_CERT_RAW"); + DUMP_EXT_ACL_TYPE_FMT(USER_CERTCHAIN_RAW, " %%USER_CERTCHAIN_RAW"); + DUMP_EXT_ACL_TYPE_FMT(USER_CERT, " %%USER_CERT_%s", format->header); + DUMP_EXT_ACL_TYPE_FMT(CA_CERT, " %%CA_CERT_%s", format->header); #endif #if USE_AUTH DUMP_EXT_ACL_TYPE(EXT_USER); #endif DUMP_EXT_ACL_TYPE(EXT_LOG); DUMP_EXT_ACL_TYPE(TAG); + DUMP_EXT_ACL_TYPE_FMT(PERCENT, " %%%%"); default: fatal("unknown external_acl format error"); break; -- 2.47.2