Hello,
Attached a typo fix for r14973 which caused Jenkins errors.
Regards,
Eduard.
A typo fix for r14973 revealed by Jenkins.
Should use 'ConfigParser::LastTokenWasQuoted()' instead of
'ConfigParser::LastTokenWasQuoted'.
=== modified file 'src/cache_cf.cc'
--- src/cache_cf.cc 2016-12-10 06:12:06 +0000
+++ src/cache_cf.cc 2016-12-10 11:53:07 +0000
@@ -1817,61 +1817,61 @@
}
static void
free_authparam(Auth::ConfigVector * cfg)
{
/* Wipe the Auth globals and Detach/Destruct component config + state. */
cfg->clear();
/* on reconfigure initialize new auth schemes for the new config. */
if (reconfiguring) {
Auth::Init();
}
}
static void
dump_authparam(StoreEntry * entry, const char *name, Auth::ConfigVector cfg)
{
for (Auth::ConfigVector::iterator i = cfg.begin(); i != cfg.end(); ++i)
(*i)->dump(entry, name, (*i));
}
static void
parse_AuthSchemes(acl_access **authSchemes)
{
const char *tok = ConfigParser::NextQuotedToken();
if (!tok) {
debugs(29, DBG_CRITICAL, "FATAL: auth_schemes missing the parameter");
self_destruct();
return;
}
- Config.authSchemesConfigs.push_back(Auth::SchemesConfig(tok, ConfigParser::LastTokenWasQuoted));
+ Config.authSchemesConfigs.push_back(Auth::SchemesConfig(tok, ConfigParser::LastTokenWasQuoted()));
const allow_t action = allow_t(ACCESS_ALLOWED, Config.authSchemesConfigs.size() - 1);
ParseAclWithAction(authSchemes, action, "auth_schemes");
}
static void
free_AuthSchemes(acl_access **authSchemes)
{
Config.authSchemesConfigs.clear();
free_acl_access(authSchemes);
}
static void
dump_AuthSchemes(StoreEntry *entry, const char *name, acl_access *authSchemes)
{
if (authSchemes)
dump_SBufList(entry, authSchemes->treeDump(name, [](const allow_t &action) {
return Config.authSchemesConfigs.at(action.kind).rawSchemes;
}));
}
#endif /* USE_AUTH */
static void
ParseAclWithAction(acl_access **access, const allow_t &action, const char *desc, ACL *acl)
{
assert(access);
SBuf name;
if (!*access) {
*access = new Acl::Tree;
name.Printf("(%s rules)", desc);
_______________________________________________
squid-dev mailing list
[email protected]
http://lists.squid-cache.org/listinfo/squid-dev
