resolv.conf parsing: Test adns_af:dampstring

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

diff --git a/regress/case-unkopts.out b/regress/case-unkopts.out
index fc0241c90d9f64762de57a550ae59c208ef1d0b7..42ee65b7b253613b51a99a8335fdb49840ef28eb 100644 (file)
--- a/regress/case-unkopts.out
+++ b/regress/case-unkopts.out
@@ -2,6 +2,8 @@ adns debug: using nameserver 172.18.45.6
 adns: <supplied configuration text>:5: unknown option `wombat'
 adns: <supplied configuration text>:6: unknown configuration directive `stoat'
 adns: <supplied configuration text>:7: unknown option `zorkmid'
 adns: <supplied configuration text>:5: unknown option `wombat'
 adns: <supplied configuration text>:6: unknown configuration directive `stoat'
 adns: <supplied configuration text>:7: unknown option `zorkmid'

+adns: <supplied configuration text>:8: option adns_af has bad value or entry `dampstring' (option must be `any', or list of `ipv4',`ipv6')
+adns: <supplied configuration text>:8: unknown option `spong'

 chiark.greenend.org.uk flags 0 type 1 A(-) submitted
 chiark.greenend.org.uk flags 0 type A(-): OK; nrrs=1; cname=$; owner=$; ttl=3600
  212.13.197.229
 chiark.greenend.org.uk flags 0 type 1 A(-) submitted
 chiark.greenend.org.uk flags 0 type A(-): OK; nrrs=1; cname=$; owner=$; ttl=3600
  212.13.197.229

diff --git a/regress/init-unkopts.text b/regress/init-unkopts.text
index e420346ec255facd660cdf8012904fd30e60dab5..a1488649f4eecf7d9e093e7984498717fa97157f 100644 (file)
--- a/regress/init-unkopts.text
+++ b/regress/init-unkopts.text
@@ -5,5 +5,7 @@ lwserver 127.0.0.1
 options timeout:1 attempts:30 rotate no-check-names inet6 edns0 wombat
 stoat
 options adns_checkc:freq zorkmid
 options timeout:1 attempts:30 rotate no-check-names inet6 edns0 wombat
 stoat
 options adns_checkc:freq zorkmid

+options adns_af:any adns_af:ipv6,ipv4,dampstring spong

 options adns_ignoreunkcfg wombat2
 stoat2
 options adns_ignoreunkcfg wombat2
 stoat2

+options adns_af:any adns_af:ipv6,ipv4,dampstring2 spong2