Root hints are emitted only when asked for

This makes it possible to configure servers which serve only
locally defined zones, and also servers with multiple views.

diff --git a/README b/README
index 6ddfb09bbc6a31cac7b91db147c4b7859a1bff8d..4e6b56bac1b91c19d5d8c9f914cb39fa40601ca0 100644 (file)
--- a/README
+++ b/README
@@ -139,6 +139,13 @@ REVERSE(network, primary-files...)
                You can also use the REV macro explicitly, which can be handy
                for example in SECONDARY declarations.
 
+ROOTHINT()
+               Insert a definition of hints for reaching root servers into named.conf.
+               This is necessary if you want your DNS server to resolve foreign
+               domains; otherwise, it will only give out authoritative answers
+               for locally defined zones and forward queries. The location of the
+               file with the hints can be set by the ROOTCACHE directive (see below).
+
 FORWARDED(zone, ip...)
                Define a forwarding zone. All queries are forwarded to the
                specified name servers.

diff --git a/cf.dist/domains b/cf.dist/domains
index e1be8a8d447ff37732e4fabe0c9fe84edf9bf9f5..b8974700087ca933c3e285a46892cd2e074a1041 100644 (file)
--- a/cf.dist/domains
+++ b/cf.dist/domains
@@ -1,5 +1,8 @@
 ; An example domain table for the NSC
 
+; Hints how to find root servers
+ROOTHINT()
+
 ; Various mandatory things required by RFC 1912, section 4.1
 PRIMARY(localhost)
 REVERSE(127.0.0, localhost)

diff --git a/cf.ucw/domains b/cf.ucw/domains
index a19999c5b0e7327f12e39b30fbbef87395e3f271..a4c893403153900f843aa76ecbd55fdcef74ea73 100644 (file)
--- a/cf.ucw/domains
+++ b/cf.ucw/domains
@@ -1,5 +1,8 @@
 ; Domain table for NSC at UCW
 
+; Hints how to find root servers
+ROOTHINT()
+
 ; Various mandatory things required by RFC 1912, section 4.1
 PRIMARY(localhost)
 REVERSE(127.0.0, localhost)

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index 8392b4dad048e9035e0bb55574264234cf0266ad..ebf6532abeb4b61d2db409873ff1e8fb012504c5 100644 (file)
--- a/m4/mkconf.m4
+++ b/m4/mkconf.m4
@@ -48,6 +48,15 @@ define(`BLACKHOLE', `divert(0)zone "$1" in {
 
 divert(-1)')
 
+# Root hint zone
+
+define(`ROOTHINT', `divert(0)zone "." in {
+       type hint;
+       file "ROOTCACHE";
+};
+
+divert(-1)')
+
 # Manual insertion of config file material
 
 define(`CONFIG', `divert(0)$1
@@ -68,9 +77,4 @@ divert(0)dnl
 `#'    Please don't edit manually
 `#'
 
-zone "." in {
-       type hint;
-       file "ROOTCACHE";
-};
-
 divert(-1)