diff options
Diffstat (limited to 'external/mpl/bind/dist/bin/tests')
21 files changed, 35 insertions, 615 deletions
diff --git a/external/mpl/bind/dist/bin/tests/optional/ratelimiter_test.c b/external/mpl/bind/dist/bin/tests/optional/ratelimiter_test.c index 92f0ab0d7a1..a6928b29699 100644 --- a/external/mpl/bind/dist/bin/tests/optional/ratelimiter_test.c +++ b/external/mpl/bind/dist/bin/tests/optional/ratelimiter_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: ratelimiter_test.c,v 1.6 2022/09/23 12:15:23 christos Exp $ */ +/* $NetBSD: ratelimiter_test.c,v 1.7 2023/06/26 22:02:59 christos Exp $ */ /* * Copyright (C) Internet Systems Consortium, Inc. ("ISC") @@ -88,7 +88,7 @@ shutdown_all(isc_task_t *task, isc_event_t *event) { UNUSED(event); printf("shutdown all\n"); for (i = 0; i < NEVENTS; i++) { - isc_timer_detach(&timers[i]); + isc_timer_destroy(&timers[i]); } isc_app_shutdown(); diff --git a/external/mpl/bind/dist/bin/tests/optional/rbt_test.c b/external/mpl/bind/dist/bin/tests/optional/rbt_test.c index 927f8447ff5..9327309a9cc 100644 --- a/external/mpl/bind/dist/bin/tests/optional/rbt_test.c +++ b/external/mpl/bind/dist/bin/tests/optional/rbt_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: rbt_test.c,v 1.7 2023/01/25 21:43:24 christos Exp $ */ +/* $NetBSD: rbt_test.c,v 1.8 2023/06/26 22:02:59 christos Exp $ */ /* * Copyright (C) Internet Systems Consortium, Inc. ("ISC") @@ -186,8 +186,8 @@ iterate(dns_rbt_t *rbt, bool forward) { dns_rbtnodechain_t chain; dns_fixedname_t fixedorigin; isc_result_t result; - isc_result_t (*move)(dns_rbtnodechain_t * chain, dns_name_t * name, - dns_name_t * origin); + isc_result_t (*move)(dns_rbtnodechain_t *chain, dns_name_t *name, + dns_name_t *origin); dns_rbtnodechain_init(&chain); diff --git a/external/mpl/bind/dist/bin/tests/optional/shutdown_test.c b/external/mpl/bind/dist/bin/tests/optional/shutdown_test.c index 10108209f53..52fbc161246 100644 --- a/external/mpl/bind/dist/bin/tests/optional/shutdown_test.c +++ b/external/mpl/bind/dist/bin/tests/optional/shutdown_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: shutdown_test.c,v 1.7 2022/09/23 12:15:23 christos Exp $ */ +/* $NetBSD: shutdown_test.c,v 1.8 2023/06/26 22:02:59 christos Exp $ */ /* * Copyright (C) Internet Systems Consortium, Inc. ("ISC") @@ -75,7 +75,7 @@ shutdown_action(isc_task_t *task, isc_event_t *event) { printf("task %s (%p) shutdown\n", info->name, task); if (strcmp(info->name, "0") == 0) { - isc_timer_detach(&info->timer); + isc_timer_destroy(&info->timer); nevent = isc_event_allocate(info->mctx, info, T2_SHUTDOWNOK, t2_shutdown, &tasks[1], sizeof(*event)); @@ -106,7 +106,7 @@ tick(isc_task_t *task, isc_event_t *event) { if (info->ticks == 10) { isc_app_shutdown(); } else if (info->ticks >= 15 && info->exiting) { - isc_timer_detach(&info->timer); + isc_timer_destroy(&info->timer); isc_task_detach(&info->task); nevent = isc_event_allocate( info->mctx, info, T2_SHUTDOWNDONE, t1_shutdown, @@ -116,7 +116,7 @@ tick(isc_task_t *task, isc_event_t *event) { isc_task_detach(&info->peer); } } else if (strcmp(info->name, "foo") == 0) { - isc_timer_detach(&info->timer); + isc_timer_destroy(&info->timer); nevent = isc_event_allocate(info->mctx, info, FOO_EVENT, foo_event, task, sizeof(*event)); RUNTIME_CHECK(nevent != NULL); diff --git a/external/mpl/bind/dist/bin/tests/optional/sock_test.c b/external/mpl/bind/dist/bin/tests/optional/sock_test.c index 6d61dc98a45..01f71244d2a 100644 --- a/external/mpl/bind/dist/bin/tests/optional/sock_test.c +++ b/external/mpl/bind/dist/bin/tests/optional/sock_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: sock_test.c,v 1.6 2022/09/23 12:15:23 christos Exp $ */ +/* $NetBSD: sock_test.c,v 1.7 2023/06/26 22:02:59 christos Exp $ */ /* * Copyright (C) Internet Systems Consortium, Inc. ("ISC") @@ -247,7 +247,7 @@ timeout(isc_task_t *task, isc_event_t *event) { printf("Timeout, canceling IO on socket %p (task %p)\n", sock, task); isc_socket_cancel(sock, NULL, ISC_SOCKCANCEL_ALL); - isc_timer_detach((isc_timer_t **)&event->ev_sender); + isc_timer_destroy((isc_timer_t **)&event->ev_sender); isc_event_free(&event); } diff --git a/external/mpl/bind/dist/bin/tests/optional/task_test.c b/external/mpl/bind/dist/bin/tests/optional/task_test.c index 2913ff19eb8..8e509ed8405 100644 --- a/external/mpl/bind/dist/bin/tests/optional/task_test.c +++ b/external/mpl/bind/dist/bin/tests/optional/task_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: task_test.c,v 1.6 2022/09/23 12:15:23 christos Exp $ */ +/* $NetBSD: task_test.c,v 1.7 2023/06/26 22:02:59 christos Exp $ */ /* * Copyright (C) Internet Systems Consortium, Inc. ("ISC") @@ -196,8 +196,8 @@ main(int argc, char *argv[]) { Sleep(10000); #endif /* ifndef WIN32 */ printf("destroy\n"); - isc_timer_detach(&ti1); - isc_timer_detach(&ti2); + isc_timer_destroy(&ti1); + isc_timer_destroy(&ti2); isc_timermgr_destroy(&timgr); isc_managers_destroy(&netmgr, &taskmgr); printf("destroyed\n"); diff --git a/external/mpl/bind/dist/bin/tests/optional/timer_test.c b/external/mpl/bind/dist/bin/tests/optional/timer_test.c index 4810006dc9f..b74ac1b05b1 100644 --- a/external/mpl/bind/dist/bin/tests/optional/timer_test.c +++ b/external/mpl/bind/dist/bin/tests/optional/timer_test.c @@ -1,4 +1,4 @@ -/* $NetBSD: timer_test.c,v 1.7 2022/09/23 12:15:23 christos Exp $ */ +/* $NetBSD: timer_test.c,v 1.8 2023/06/26 22:02:59 christos Exp $ */ /* * Copyright (C) Internet Systems Consortium, Inc. ("ISC") @@ -166,9 +166,9 @@ main(int argc, char *argv[]) { Sleep(15000); #endif /* ifndef WIN32 */ printf("destroy\n"); - isc_timer_detach(&ti1); - isc_timer_detach(&ti2); - isc_timer_detach(&ti3); + isc_timer_destroy(&ti1); + isc_timer_destroy(&ti2); + isc_timer_destroy(&ti3); #ifndef WIN32 sleep(2); #else /* ifndef WIN32 */ diff --git a/external/mpl/bind/dist/bin/tests/system/feature-test.c b/external/mpl/bind/dist/bin/tests/system/feature-test.c index 21a7c4f3374..19fcd80d003 100644 --- a/external/mpl/bind/dist/bin/tests/system/feature-test.c +++ b/external/mpl/bind/dist/bin/tests/system/feature-test.c @@ -1,4 +1,4 @@ -/* $NetBSD: feature-test.c,v 1.10 2023/01/25 21:43:24 christos Exp $ */ +/* $NetBSD: feature-test.c,v 1.11 2023/06/26 22:02:59 christos Exp $ */ /* * Copyright (C) Internet Systems Consortium, Inc. ("ISC") @@ -19,6 +19,7 @@ #include <string.h> #include <unistd.h> +#include <isc/md.h> #include <isc/net.h> #include <isc/print.h> #include <isc/util.h> @@ -47,6 +48,7 @@ usage() { fprintf(stderr, "\t--have-json-c\n"); fprintf(stderr, "\t--have-libxml2\n"); fprintf(stderr, "\t--ipv6only=no\n"); + fprintf(stderr, "\t--md5\n"); fprintf(stderr, "\t--tsan\n"); fprintf(stderr, "\t--with-dlz-filesystem\n"); fprintf(stderr, "\t--with-idn\n"); @@ -176,6 +178,20 @@ main(int argc, char **argv) { #endif /* ifdef WIN32 */ } + if (strcmp(argv[1], "--md5") == 0) { + unsigned char digest[ISC_MAX_MD_SIZE]; + const unsigned char test[] = "test"; + unsigned int size = sizeof(digest); + + if (isc_md(ISC_MD_MD5, test, sizeof(test), digest, &size) == + ISC_R_SUCCESS) + { + return (0); + } else { + return (1); + } + } + if (strcmp(argv[1], "--tsan") == 0) { #if defined(__has_feature) #if __has_feature(thread_sanitizer) diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/controls.conf.in b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/controls.conf.in deleted file mode 100644 index 697b02a4225..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/controls.conf.in +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -controls { - inet 127.0.0.1 port @CONTROLPORT@ - allow { 127.0.0.1/32; ::1/128; } - keys { "rndc-key"; }; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.dirconf b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.dirconf deleted file mode 100644 index 661a6fb0636..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.dirconf +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -logging { - channel default_log { - file "named_dir"; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; -}; - -include "controls.conf"; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; - -zone "." { - type primary; - file "root.db"; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601 b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601 deleted file mode 100644 index 53f41cf1fb0..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601 +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -logging { - channel default_log { - file "named_iso8601"; - print-time iso8601; - severity debug 9; - }; - category default { default_log; default_debug; }; -}; - -include "controls.conf"; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; - -zone "." { - type primary; - file "root.db"; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601-utc b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601-utc deleted file mode 100644 index 5c1a52c962e..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.iso8601-utc +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -logging { - channel default_log { - file "named_iso8601_utc"; - print-time iso8601-utc; - severity debug 9; - }; - category default { default_log; default_debug; }; -}; - -include "controls.conf"; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; - -zone "." { - type primary; - file "root.db"; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.pipeconf b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.pipeconf deleted file mode 100644 index f10d98ae7fa..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.pipeconf +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -logging { - channel default_log { - file "named_pipe"; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; -}; - -include "controls.conf"; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; - -zone "." { - type primary; - file "root.db"; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plain b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plain deleted file mode 100644 index ea651f3706e..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plain +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -logging { - channel default_log { - file "named_log"; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; - - channel query_log { - file "query_log"; - print-time yes; - buffered yes; - }; - category queries { query_log; }; -}; - -include "controls.conf"; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; - - -zone "." { - type primary; - file "root.db"; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plainconf b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plainconf deleted file mode 100644 index 2e2ee606744..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.plainconf +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -include "controls.conf"; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; - -zone "." { - type primary; - file "root.db"; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.symconf b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.symconf deleted file mode 100644 index 304d622b854..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.symconf +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -logging { - channel default_log { - file "named_sym"; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; -}; - -include "controls.conf"; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; - -zone "." { - type primary; - file "root.db"; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.tsconf b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.tsconf deleted file mode 100644 index fe4a8d4f756..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.tsconf +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -logging { - channel default_log { - buffered no; - file "named_ts" versions 10 size 1000 suffix timestamp; # small size - severity debug 100; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; - - channel query_log { - file "query_log"; - print-time yes; - buffered yes; - }; - category queries { query_log; }; -}; - -include "controls.conf"; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; - - -zone "." { - type primary; - file "root.db"; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.unlimited b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.unlimited deleted file mode 100644 index 54041da0747..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.unlimited +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -logging { - channel default_log { - buffered no; - file "named_unlimited" versions unlimited size 1000; - severity debug 100; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; - - channel query_log { - file "query_log"; - print-time yes; - buffered yes; - }; - category queries { query_log; }; -}; - -include "controls.conf"; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; - - -zone "." { - type primary; - file "root.db"; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.versconf b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.versconf deleted file mode 100644 index 3cbd16522cf..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/named.versconf +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - query-source address 10.53.0.1; - notify-source 10.53.0.1; - transfer-source 10.53.0.1; - port @PORT@; - pid-file "named.pid"; - listen-on { 10.53.0.1; }; - listen-on-v6 { none; }; - recursion no; - notify yes; -}; - -logging { - channel default_log { - buffered no; - file "named_vers" versions 5 size 1000; // really small size - severity debug 100; - print-time yes; - }; - category default { default_log; default_debug; }; - category lame-servers { null; }; - - channel query_log { - file "query_log"; - print-time yes; - buffered yes; - }; - category queries { query_log; }; -}; - -include "controls.conf"; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; - - -zone "." { - type primary; - file "root.db"; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/rndc.conf.in b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/rndc.conf.in deleted file mode 100644 index 4bd9af7b061..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/rndc.conf.in +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * 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 https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -options { - default-server 127.0.0.1; -}; - -server 127.0.0.1 { - key "rndc-key"; - addresses { 127.0.0.1 port @CONTROLPORT@; }; -}; - -key "rndc-key" { - algorithm hmac-sha256; - secret "Am9vCg=="; -}; diff --git a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/root.db b/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/root.db deleted file mode 100644 index 58a675c63e0..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/logfileconfig/ns1/root.db +++ /dev/null @@ -1,27 +0,0 @@ -; Copyright (C) Internet Systems Consortium, Inc. ("ISC") -; -; SPDX-License-Identifier: MPL-2.0 -; -; 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 https://mozilla.org/MPL/2.0/. -; -; See the COPYRIGHT file distributed with this work for additional -; information regarding copyright ownership. - -$TTL 300 -. IN SOA gson.nominum.com. a.root.servers.nil. ( - 2000042100 ; serial - 600 ; refresh - 600 ; retry - 1200 ; expire - 600 ; minimum - ) -. NS a.root-servers.nil. -a.root-servers.nil. A 10.53.0.1 - -example. NS ns2.example. -ns2.example. A 10.53.0.2 - -tsigzone. NS ns2.tsigzone. -ns2.tsigzone. A 10.53.0.2 diff --git a/external/mpl/bind/dist/bin/tests/system/ttl/tests.sh b/external/mpl/bind/dist/bin/tests/system/ttl/tests.sh deleted file mode 100644 index ea32c1b0b9c..00000000000 --- a/external/mpl/bind/dist/bin/tests/system/ttl/tests.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# 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 https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -. $SYSTEMTESTTOP/conf.sh - -dig_with_options() { "$DIG" +noadd +nosea +nostat +noquest +nocomm +nocmd -p "${PORT}" "$@"; } - -status=0 -t=0 - -echo_i "testing min-cache-ttl" -t=$((t+1)) -dig_with_options IN SOA min-example. @10.53.0.2 > dig.out.${t} -TTL=$(< dig.out.${t} awk '{ print $2; }') -[ "$TTL" -eq 60 ] || status=$((status+1)) - -echo_i "testing min-ncache-ttl" -t=$((t+1)) -dig_with_options IN MX min-example. @10.53.0.2 > dig.out.${t} -TTL=$(< dig.out.${t} awk '{ print $2; }') -[ "$TTL" -eq 30 ] || status=$((status+1)) - -echo_i "testing max-cache-ttl" -t=$((t+1)) -dig_with_options IN SOA max-example. @10.53.0.2 > dig.out.${t} -TTL=$(< dig.out.${t} awk '{ print $2; }') -[ "$TTL" -eq 120 ] || status=$((status+1)) - -echo_i "testing max-ncache-ttl" -t=$((t+1)) -dig_with_options IN MX max-example. @10.53.0.2 > dig.out.${t} -TTL=$(< dig.out.${t} awk '{ print $2; }') -[ "$TTL" -eq 60 ] || status=$((status+1)) - -echo_i "exit status: $status" -[ $status -eq 0 ] || exit 1 |
