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

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index ebf6532..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,7 +21,7 @@ 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
 };
@@ -48,15 +48,6 @@ define(`BLACKHOLE', `divert(0)zone "$1" in {
 
 divert(-1)')
 
-# Root hint zone
-
-define(`ROOTHINT', `divert(0)zone "." in {
-	type hint;
-	file "ROOTCACHE";
-};
-
-divert(-1)')
-
 # Manual insertion of config file material
 
 define(`CONFIG', `divert(0)$1