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

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index eedde55..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 {
@@ -55,7 +43,7 @@ divert(-1)')
 
 define(`BLACKHOLE', `divert(0)zone "$1" in {
 	type master;
-	file "cf/blackhole";
+	file "zone/blackhole";
 };
 
 divert(-1)')
@@ -80,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";