X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=m4%2Fmkconf.m4;h=8392b4dad048e9035e0bb55574264234cf0266ad;hb=b09544a247701516325cd805bd3cc8d28a058fec;hp=0d2ab00784ef3148a82b87fa2215ee42b617c0b4;hpb=5fdd42ff7477dba312833e956e45e375184c033a;p=nsc-5.git

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index 0d2ab00..8392b4d 100644
--- 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 {
@@ -51,6 +39,15 @@ ZZ_OPTIONS()dnl
 
 divert(-1)')
 
+# Blackhole zones
+
+define(`BLACKHOLE', `divert(0)zone "$1" in {
+	type master;
+	file "zone/blackhole";
+};
+
+divert(-1)')
+
 # Manual insertion of config file material
 
 define(`CONFIG', `divert(0)$1
@@ -71,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";