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

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index 0d2ab00..befb306 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)
 
@@ -8,7 +8,7 @@ include(m4/dnslib.m4)
 
 define(`DO_PRIMARY', `divert(0)zone "$1" in {
 	type master;
-	file "ZONEDIR/nsc_file_name($2)";
+	file "zone/nsc_file_name($2)";
 ZZ_OPTIONS()dnl
 };
 
@@ -21,25 +21,13 @@ define(`REVERSE', `DO_PRIMARY(REV($1),nsc_if_v6($1,`nsc_revblock6($1)',`nsc_reva
 
 define(`SECONDARY', `divert(0)zone "$1" in {
 	type slave;
-	file "BAKDIR/nsc_file_name($1)";
+	file "bak/nsc_file_name($1)";
 	masters { $2; };
 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,15 +68,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)