From: Alan T. DeKok Date: Fri, 10 Aug 2018 01:33:04 +0000 (-0400) Subject: parsed is not referenced X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=720ca8f4d8bbe713e99ea2867cf3cc31a8b9d387;p=thirdparty%2Ffreeradius-server.git parsed is not referenced referencing an item shouldn't prevent it from being parsed --- diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c index d19b422ab6b..fe1713a1ee4 100644 --- a/src/lib/server/cf_file.c +++ b/src/lib/server/cf_file.c @@ -2011,7 +2011,7 @@ CONF_ITEM *cf_reference_item(CONF_SECTION const *parent_cs, */ cp = cf_pair_find(cs, p); if (cp) { - cp->parsed = true; /* conf pairs which are referenced count as parsed */ + cp->referenced = true; /* conf pairs which are referenced count as used */ return &(cp->item); } diff --git a/src/lib/server/cf_parse.c b/src/lib/server/cf_parse.c index b42d29de112..a326cb9a6ce 100644 --- a/src/lib/server/cf_parse.c +++ b/src/lib/server/cf_parse.c @@ -941,7 +941,7 @@ static void cf_section_parse_warn(CONF_SECTION *cs) CONF_PAIR *cp; cp = cf_item_to_pair(ci); - if (cp->parsed || (ci->lineno < 0)) continue; + if (cp->parsed || cp->referenced || (ci->lineno < 0)) continue; WARN("%s[%d]: The item '%s' is defined, but is unused by the configuration", ci->filename, ci->lineno, diff --git a/src/lib/server/cf_priv.h b/src/lib/server/cf_priv.h index 6306fc06298..b7d4f4042e1 100644 --- a/src/lib/server/cf_priv.h +++ b/src/lib/server/cf_priv.h @@ -81,6 +81,7 @@ struct cf_pair { bool pass2; //!< do expansion in pass2. bool parsed; //!< Was this item used during parsing? + bool referenced; //!< Was this item referenced in the config? }; /** A section grouping multiple #CONF_PAIR