Removed ROOTHINT()

[nsc-5.git] / m4 / mkconf.m4

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index 7cbde7610ab922f8436bbcd1b0edf0fe23e0eeca..befb3066acbc65ff0e1cea69e2c49a965325e330 100644 (file)
--- 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 {
@@ -80,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)