From: Nicki Křížek Date: Thu, 23 Jul 2026 16:45:23 +0000 (+0000) Subject: Drop the no-op directory option X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68af94fa8ea27be7211dcf4569a2089bc3b7f267;p=thirdparty%2Fbind9.git Drop the no-op directory option `directory "."` chdirs to the current working directory, which is where named already runs. This option is the default, so drop it from the config. Assisted-by: Claude:claude-fable-5 --- diff --git a/bin/tests/system/chain/ns7/named.conf.j2 b/bin/tests/system/chain/ns7/named.conf.j2 index 16a7f14c6c4..b884c0536f2 100644 --- a/bin/tests/system/chain/ns7/named.conf.j2 +++ b/bin/tests/system/chain/ns7/named.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.7; query-source-v6 address fd92:7065:b8e:ffff::7; notify-source 10.53.0.7; diff --git a/bin/tests/system/class/ns2/named.conf.j2 b/bin/tests/system/class/ns2/named.conf.j2 index af6630a9be3..12f092de039 100644 --- a/bin/tests/system/class/ns2/named.conf.j2 +++ b/bin/tests/system/class/ns2/named.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.2; notify-source 10.53.0.2; transfer-source 10.53.0.2; diff --git a/bin/tests/system/class/ns3/named.conf.j2 b/bin/tests/system/class/ns3/named.conf.j2 index 524708e1587..5782db2d291 100644 --- a/bin/tests/system/class/ns3/named.conf.j2 +++ b/bin/tests/system/class/ns3/named.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.3; notify-source 10.53.0.3; transfer-source 10.53.0.3; diff --git a/bin/tests/system/dnstap/ns3/named.conf.j2 b/bin/tests/system/dnstap/ns3/named.conf.j2 index 41ae7423b33..445c5eaca61 100644 --- a/bin/tests/system/dnstap/ns3/named.conf.j2 +++ b/bin/tests/system/dnstap/ns3/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.3; transfer-source 10.53.0.3; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/dnstap/ns4/named.conf.j2 b/bin/tests/system/dnstap/ns4/named.conf.j2 index 5b36841bc53..deae8a2b719 100644 --- a/bin/tests/system/dnstap/ns4/named.conf.j2 +++ b/bin/tests/system/dnstap/ns4/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.4; transfer-source 10.53.0.4; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/dnstap/ns5/named.conf.j2 b/bin/tests/system/dnstap/ns5/named.conf.j2 index a62d67681d2..c9d428c99cf 100644 --- a/bin/tests/system/dnstap/ns5/named.conf.j2 +++ b/bin/tests/system/dnstap/ns5/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.5; transfer-source 10.53.0.5; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/fetchlimit/ns3/named.conf.j2 b/bin/tests/system/fetchlimit/ns3/named.conf.j2 index 5be01416320..81322d29042 100644 --- a/bin/tests/system/fetchlimit/ns3/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.3; transfer-source 10.53.0.3; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 index fe469059b4f..8fa446cc16a 100644 --- a/bin/tests/system/fetchlimit/ns3/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named2.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.3; transfer-source 10.53.0.3; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 index ad7b2b55519..cfaba22ce97 100644 --- a/bin/tests/system/fetchlimit/ns3/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns3/named3.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.3; transfer-source 10.53.0.3; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/fetchlimit/ns5/named.conf.j2 b/bin/tests/system/fetchlimit/ns5/named.conf.j2 index 252cb8b0006..bacbd874d95 100644 --- a/bin/tests/system/fetchlimit/ns5/named.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.5; transfer-source 10.53.0.5; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 index 793160e49dd..dd4afae11e2 100644 --- a/bin/tests/system/fetchlimit/ns5/named2.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named2.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.5; transfer-source 10.53.0.5; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 index 019996ea6f1..f74fb3619d2 100644 --- a/bin/tests/system/fetchlimit/ns5/named3.conf.j2 +++ b/bin/tests/system/fetchlimit/ns5/named3.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.5; transfer-source 10.53.0.5; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/keepalive/ns3/named.conf.j2 b/bin/tests/system/keepalive/ns3/named.conf.j2 index d1529c4bde8..f6e3198d9c4 100644 --- a/bin/tests/system/keepalive/ns3/named.conf.j2 +++ b/bin/tests/system/keepalive/ns3/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.3; transfer-source 10.53.0.3; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/padding/ns3/named.conf.j2 b/bin/tests/system/padding/ns3/named.conf.j2 index 60a273eccce..3bfe1c05957 100644 --- a/bin/tests/system/padding/ns3/named.conf.j2 +++ b/bin/tests/system/padding/ns3/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.3; transfer-source 10.53.0.3; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/padding/ns4/named.conf.j2 b/bin/tests/system/padding/ns4/named.conf.j2 index 099ac4a7aba..76466da797f 100644 --- a/bin/tests/system/padding/ns4/named.conf.j2 +++ b/bin/tests/system/padding/ns4/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.4; transfer-source 10.53.0.4; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/pipelined/ns4/named.conf.j2 b/bin/tests/system/pipelined/ns4/named.conf.j2 index d453fce291c..341db8150b7 100644 --- a/bin/tests/system/pipelined/ns4/named.conf.j2 +++ b/bin/tests/system/pipelined/ns4/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.4; transfer-source 10.53.0.4; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/reclimit/ns1/named.conf.j2 b/bin/tests/system/reclimit/ns1/named.conf.j2 index 1a3b89bd0f3..850c437d3ec 100644 --- a/bin/tests/system/reclimit/ns1/named.conf.j2 +++ b/bin/tests/system/reclimit/ns1/named.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.1; notify-source 10.53.0.1; transfer-source 10.53.0.1; diff --git a/bin/tests/system/reclimit/ns3/named.conf.j2 b/bin/tests/system/reclimit/ns3/named.conf.j2 index 7f770556276..70c96035c31 100644 --- a/bin/tests/system/reclimit/ns3/named.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.3; notify-source 10.53.0.3; transfer-source 10.53.0.3; diff --git a/bin/tests/system/reclimit/ns3/named2.conf.j2 b/bin/tests/system/reclimit/ns3/named2.conf.j2 index 4b92fd543bc..6a9908d2d8a 100644 --- a/bin/tests/system/reclimit/ns3/named2.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named2.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.3; notify-source 10.53.0.3; transfer-source 10.53.0.3; diff --git a/bin/tests/system/reclimit/ns3/named3.conf.j2 b/bin/tests/system/reclimit/ns3/named3.conf.j2 index ea6a1bbb3a5..f9c6e69ce67 100644 --- a/bin/tests/system/reclimit/ns3/named3.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named3.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.3; notify-source 10.53.0.3; transfer-source 10.53.0.3; diff --git a/bin/tests/system/reclimit/ns3/named4.conf.j2 b/bin/tests/system/reclimit/ns3/named4.conf.j2 index 71d57fb4aa0..1be2229b04c 100644 --- a/bin/tests/system/reclimit/ns3/named4.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named4.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.3; notify-source 10.53.0.3; transfer-source 10.53.0.3; diff --git a/bin/tests/system/reclimit/ns3/named5.conf.j2 b/bin/tests/system/reclimit/ns3/named5.conf.j2 index f9a484a9d3c..fb46f2ffbbb 100644 --- a/bin/tests/system/reclimit/ns3/named5.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named5.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.3; notify-source 10.53.0.3; transfer-source 10.53.0.3; diff --git a/bin/tests/system/reclimit/ns3/named6.conf.j2 b/bin/tests/system/reclimit/ns3/named6.conf.j2 index 6d153b3b506..cb6beb06bcf 100644 --- a/bin/tests/system/reclimit/ns3/named6.conf.j2 +++ b/bin/tests/system/reclimit/ns3/named6.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.3; notify-source 10.53.0.3; transfer-source 10.53.0.3; diff --git a/bin/tests/system/statistics/ns3/named.conf.j2 b/bin/tests/system/statistics/ns3/named.conf.j2 index 6de8fa3526d..1d1b1c9ac7f 100644 --- a/bin/tests/system/statistics/ns3/named.conf.j2 +++ b/bin/tests/system/statistics/ns3/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.3; transfer-source 10.53.0.3; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/tcp/ns3/named.conf.j2 b/bin/tests/system/tcp/ns3/named.conf.j2 index 5f0c9697593..75d72b9ea4e 100644 --- a/bin/tests/system/tcp/ns3/named.conf.j2 +++ b/bin/tests/system/tcp/ns3/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.3; transfer-source 10.53.0.3; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/tcp/ns4/named.conf.j2 b/bin/tests/system/tcp/ns4/named.conf.j2 index ec170e2788c..6b947893abb 100644 --- a/bin/tests/system/tcp/ns4/named.conf.j2 +++ b/bin/tests/system/tcp/ns4/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.4; transfer-source 10.53.0.4; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/tcp/ns5/named.conf.j2 b/bin/tests/system/tcp/ns5/named.conf.j2 index 84cce7f44ae..19fe63c9c44 100644 --- a/bin/tests/system/tcp/ns5/named.conf.j2 +++ b/bin/tests/system/tcp/ns5/named.conf.j2 @@ -8,7 +8,6 @@ options { notify-source 10.53.0.5; transfer-source 10.53.0.5; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/ttl/ns2/named.conf.j2 b/bin/tests/system/ttl/ns2/named.conf.j2 index 00adee32f1b..664b46a2596 100644 --- a/bin/tests/system/ttl/ns2/named.conf.j2 +++ b/bin/tests/system/ttl/ns2/named.conf.j2 @@ -1,5 +1,4 @@ options { - directory "."; query-source address 10.53.0.2; notify-source 10.53.0.2; transfer-source 10.53.0.2; diff --git a/bin/tests/system/views/ns3/named.conf.j2 b/bin/tests/system/views/ns3/named.conf.j2 index 0b663b64ae7..13a403b9ff2 100644 --- a/bin/tests/system/views/ns3/named.conf.j2 +++ b/bin/tests/system/views/ns3/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.3; transfer-source 10.53.0.3; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/views/ns3/named2.conf.j2 b/bin/tests/system/views/ns3/named2.conf.j2 index 9dd96058880..aacc4a42575 100644 --- a/bin/tests/system/views/ns3/named2.conf.j2 +++ b/bin/tests/system/views/ns3/named2.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.3; transfer-source 10.53.0.3; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.3; }; listen-on-v6 { none; }; diff --git a/bin/tests/system/views/ns5/named.conf.j2 b/bin/tests/system/views/ns5/named.conf.j2 index 833619312dc..bb4cb99e295 100644 --- a/bin/tests/system/views/ns5/named.conf.j2 +++ b/bin/tests/system/views/ns5/named.conf.j2 @@ -3,7 +3,6 @@ options { notify-source 10.53.0.5; transfer-source 10.53.0.5; port @PORT@; - directory "."; pid-file "named.pid"; listen-on { 10.53.0.5; }; listen-on-v6 { none; };