add more dnstap/dnstap-output combinations

(cherry picked from commit f3d53630c302dffb9b429b2cbc0aa2c079116118)

diff --git a/bin/tests/system/dnstap/bad-missing-dnstap-output-view.conf b/bin/tests/system/dnstap/bad-missing-dnstap-output-view.conf
new file mode 100644 (file)
index 0000000..ebd0982
--- /dev/null
+++ b/bin/tests/system/dnstap/bad-missing-dnstap-output-view.conf
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+view "view" {
+       dnstap { client; auth; };
+};

diff --git a/bin/tests/system/dnstap/good-dnstap-in-options.conf b/bin/tests/system/dnstap/good-dnstap-in-options.conf
new file mode 100644 (file)
index 0000000..fe2bd93
--- /dev/null
+++ b/bin/tests/system/dnstap/good-dnstap-in-options.conf
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+options {
+       dnstap-output           unix "/var/run/named/dnstap.sock";
+       dnstap-identity         hostname;
+       dnstap                  { client response; };
+};

diff --git a/bin/tests/system/dnstap/good-dnstap-in-view.conf b/bin/tests/system/dnstap/good-dnstap-in-view.conf
new file mode 100644 (file)
index 0000000..6fbbec4
--- /dev/null
+++ b/bin/tests/system/dnstap/good-dnstap-in-view.conf
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+options {
+       dnstap-output           unix "/var/run/named/dnstap.sock";
+       dnstap-identity         hostname;
+};
+
+view "view" {
+       dnstap                  { client response; };
+};

diff --git a/util/copyrights b/util/copyrights
index be7869d52abd8bc4b13c913859ad1d730a3eb600..1bcdb97e2ead5fc1fba45c6b1c7ebc4fdd214546 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1232,8 +1232,11 @@
 ./bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-min.conf     CONF-C  2016,2018,2019
 ./bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-max.conf       CONF-C  2016,2018,2019
 ./bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-min.conf       CONF-C  2016,2018,2019
+./bin/tests/system/dnstap/bad-missing-dnstap-output-view.conf  CONF-C  2019
 ./bin/tests/system/dnstap/bad-missing-dnstap-output.conf       CONF-C  2019
 ./bin/tests/system/dnstap/clean.sh             SH      2015,2016,2017,2018,2019
+./bin/tests/system/dnstap/good-dnstap-in-options.conf  CONF-C  2019
+./bin/tests/system/dnstap/good-dnstap-in-view.conf     CONF-C  2019
 ./bin/tests/system/dnstap/good-fstrm-set-buffer-hint.conf      CONF-C  2016,2018,2019
 ./bin/tests/system/dnstap/good-fstrm-set-flush-timeout.conf    CONF-C  2016,2018,2019
 ./bin/tests/system/dnstap/good-fstrm-set-input-queue-size.conf CONF-C  2016,2018,2019