From: Amos Jeffries Date: Wed, 16 Dec 2015 14:06:32 +0000 (+1300) Subject: Add missing parts to rev.14346 for squid.conf parse and display X-Git-Tag: SQUID_4_0_4~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0278bdcbf06efbd5eb04992f65e6fd2c0058f333;p=thirdparty%2Fsquid.git Add missing parts to rev.14346 for squid.conf parse and display --- diff --git a/src/security/PeerOptions.cc b/src/security/PeerOptions.cc index 3bcdc1fd64..8142a5ec07 100644 --- a/src/security/PeerOptions.cc +++ b/src/security/PeerOptions.cc @@ -91,6 +91,8 @@ Security::PeerOptions::parse(const char *token) } sslFlags = SBuf(token + 6); parsedFlags = parseFlags(); + } else if (strncmp(token, "no-default-ca", 13) == 0) { + flags.noDefaultCa = true; } else if (strncmp(token, "domain=", 7) == 0) { sslDomain = SBuf(token + 7); } else { @@ -135,6 +137,9 @@ Security::PeerOptions::dumpCfg(Packable *p, const char *pfx) const if (!sslFlags.isEmpty()) p->appendf(" %sflags=" SQUIDSBUFPH, pfx, SQUIDSBUFPRINT(sslFlags)); + + if (flags.noDefaultCa) + p->appendf(" %sno-default-ca", pfx); } void