X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fmkconf.m4;h=927ea9e8f851feb659b2ec87cc1545db3f027c77;hb=82fc39863289bfc071634126e7a242a1573a252c;hp=eedde55b1e3119cf83e6db6f2e5981c0d5c08acf;hpb=0f28cfaa52b633c4a0217345731973565b6ea897;p=nsc-5.git

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index eedde55..927ea9e 100644
--- a/m4/mkconf.m4
+++ b/m4/mkconf.m4
@@ -1,6 +1,6 @@
 dnl ###
 dnl ### NSC -- BIND Config File Builder
-dnl ### (c) 1997--2006 Martin Mares <mj@ucw.cz>
+dnl ### (c) 1997--2011 Martin Mares <mj@ucw.cz>
 dnl ###
 include(m4/dnslib.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)