Do not generate BIND options any longer

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

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index e5779217959d675eb42fbbc6e3d69522976e3206..8392b4dad048e9035e0bb55574264234cf0266ad 100644 (file)
--- a/m4/mkconf.m4
+++ b/m4/mkconf.m4
@@ -28,15 +28,23 @@ ZZ_OPTIONS()dnl
 
 divert(-1)')
 
-# Definition of forwarders for both normal and slave mode
+# Definition of a forwarding zone
 
-define(`FORWard', `patsubst(`$*',`,',`; ')')
-define(`FORWArd', `    forward $1;
+define(`FORWARDING', `divert(0)zone "$1" in {
+       type forward;
+       forward only;
        forwarders { FORWard(shift($@),)};
-')
+ZZ_OPTIONS()dnl
+};
 
-define(`FORWARD', `FORWArd(first, $@)')
-define(`SLAVE', `FORWArd(only, $@)')
+divert(-1)')
+
+# Blackhole zones
+
+define(`BLACKHOLE', `divert(0)zone "$1" in {
+       type master;
+       file "zone/blackhole";
+};
 
 divert(-1)')
 
@@ -60,12 +68,6 @@ divert(0)dnl
 `#'    Please don't edit manually
 `#'
 
-options {
-       directory "ROOT";
-       interface-interval 0;
-BIND_OPTIONS
-};
-
 zone "." in {
        type hint;
        file "ROOTCACHE";