Do not generate BIND options any longer

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

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index 131424ffb9d021c65caa09fd2cd45e16f6cac761..8392b4dad048e9035e0bb55574264234cf0266ad 100644 (file)
--- a/m4/mkconf.m4
+++ b/m4/mkconf.m4
@@ -1,6 +1,6 @@
 dnl ###
 dnl ### NSC -- BIND Config File Builder
-dnl ### (c) 1997--2005 Martin Mares <mj@ucw.cz>
+dnl ### (c) 1997--2006 Martin Mares <mj@ucw.cz>
 dnl ###
 include(m4/dnslib.m4)
 
@@ -28,15 +28,23 @@ ZZ_OPTIONS()dnl
 
 divert(-1)')
 
-# Definition of forwarders for both normal and slave mode
+# Definition of a forwarding zone
 
-define(`FORWard', `patsubst(`$@',`,',`; ')')
-define(`FORWArd', `divert(0)   forward $1;
+define(`FORWARDING', `divert(0)zone "$1" in {
+       type forward;
+       forward only;
        forwarders { FORWard(shift($@),)};
+ZZ_OPTIONS()dnl
+};
+
 divert(-1)')
 
-define(`FORWARD', `FORWArd(first, $@)')
-define(`SLAVE', `FORWArd(only, $@)')
+# Blackhole zones
+
+define(`BLACKHOLE', `divert(0)zone "$1" in {
+       type master;
+       file "zone/blackhole";
+};
 
 divert(-1)')
 
@@ -60,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";