From: W.C.A. Wijngaards Date: Thu, 16 Jul 2020 12:47:15 +0000 (+0200) Subject: - Fix check conf test for referencing installation paths. X-Git-Tag: 1.11.0rc1~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84adade86ce1c49cc8967436666b1ca819b77718;p=thirdparty%2Funbound.git - Fix check conf test for referencing installation paths. --- diff --git a/doc/Changelog b/doc/Changelog index d7fb1e298..38987e7f1 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +16 July 2020: Wouter + - Fix check conf test for referencing installation paths. + 16 July 2020: George - Introduce 'include-toplevel:' configuration option. diff --git a/testdata/04-checkconf.tdir/bad.badfwd b/testdata/04-checkconf.tdir/bad.badfwd index 27d58c5ea..139d31238 100644 --- a/testdata/04-checkconf.tdir/bad.badfwd +++ b/testdata/04-checkconf.tdir/bad.badfwd @@ -2,6 +2,7 @@ server: # to make sure the check doesn't fail on username or chrootdir. username: "" chroot: "" + directory: "" forward-zone: name: "example.com" diff --git a/testdata/04-checkconf.tdir/bad.user b/testdata/04-checkconf.tdir/bad.user index 40631abb4..ffa556e44 100644 --- a/testdata/04-checkconf.tdir/bad.user +++ b/testdata/04-checkconf.tdir/bad.user @@ -1,2 +1,4 @@ server: username: blabla_noexist_user + chroot: "" + directory: "" diff --git a/testdata/04-checkconf.tdir/good.include-toplevel b/testdata/04-checkconf.tdir/good.include-toplevel index 91dc6980a..e88df7d56 100644 --- a/testdata/04-checkconf.tdir/good.include-toplevel +++ b/testdata/04-checkconf.tdir/good.include-toplevel @@ -10,3 +10,7 @@ server: identity: "top 2" include-toplevel: include.includetop.withclauses.* include-toplevel: include.include.withclauses.* include-toplevel: include.include.withclauses.* +server: + chroot: "" + directory: "" + username: ""