resolv.conf parsing: Treat unknown adns_af: values correctly

These shouldn't be fatal, and they should be affected by
ads->config_report_unknown.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/setup.c b/src/setup.c
index c52966d22547089cd9226fa080a391b537734625..7171f5b7be2257c281af7c47410c69b6139465bf 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -314,9 +314,11 @@ static void ccf_options(adns_state ads, const char *fn,
        else if (WORD_IS("ipv6"))
          ads->iflags |= adns_if_permit_ipv6;
        else {
        else if (WORD_IS("ipv6"))
          ads->iflags |= adns_if_permit_ipv6;
        else {

-         configparseerr(ads,fn,lno, "option adns_af has bad value `%.*s' "
-                        "(must be `any' or list {`ipv4',`ipv6'},...)",
-                        (int)(endword-word), word);
+         if (ads->config_report_unknown)
+           adns__diag(ads,-1,0,"%s:%d: "
+                      "option adns_af has bad value or entry `%.*s' "
+                      "(option must be `any', or list of `ipv4',`ipv6')",
+                      fn,lno, (int)(endword-word),word);

          break;
        }
        if (!comma) break;
          break;
        }
        if (!comma) break;