Root hints are emitted only when asked for

[nsc-5.git] / m4 / mkconf.m4

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index eedde55b1e3119cf83e6db6f2e5981c0d5c08acf..ebf6532abeb4b61d2db409873ff1e8fb012504c5 100644 (file)
--- a/m4/mkconf.m4
+++ b/m4/mkconf.m4
@@ -28,18 +28,6 @@ ZZ_OPTIONS()dnl
 
 divert(-1)')
 
-# Definition of forwarders for both normal and slave mode
-
-define(`FORWard', `patsubst(`$*',`,',`; ')')
-define(`FORWArd', `    forward $1;
-       forwarders { FORWard(shift($@),)};
-')
-
-define(`FORWARD', `FORWArd(first, $@)')
-define(`SLAVE', `FORWArd(only, $@)')
-
-divert(-1)')
-
 # Definition of a forwarding zone
 
 define(`FORWARDING', `divert(0)zone "$1" in {
@@ -55,7 +43,16 @@ divert(-1)')
 
 define(`BLACKHOLE', `divert(0)zone "$1" in {
        type master;
-       file "cf/blackhole";
+       file "zone/blackhole";
+};
+
+divert(-1)')
+
+# Root hint zone
+
+define(`ROOTHINT', `divert(0)zone "." in {
+       type hint;
+       file "ROOTCACHE";
 };
 
 divert(-1)')
@@ -80,15 +77,4 @@ divert(0)dnl
 `#'    Please don't edit manually
 `#'
 
-options {
-       directory "ROOT";
-       interface-interval 0;
-BIND_OPTIONS
-};
-
-zone "." in {
-       type hint;
-       file "ROOTCACHE";
-};
-
 divert(-1)