Do not generate BIND options any longer

diff --git a/NEWS b/NEWS
index 23ddb6901498fe57c5b5c4f6f325cb67cc519fab..80629800035108312e203abf8d59346cc32f0c71 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@
   o  Added FORWARDING macro for generating forward-only zones.
   o  Added BLACKHOLE macro for blackhole zones as per RFC 6303.
      Blackhole zones in example cf/domains updated to use this macro.
+  o  Given that BIND does not support combination of options { }
+     sections, we do not generate them any longer -- write the
+     appropriate options to BIND config file and include the part
+     with the list of zones generated by NSC from there. This means
+     that BIND_OPTIONS, FORWARD and SLAVE are gone.
 
 Version 3.1  [21-05-2008]
 

diff --git a/README b/README
index 776108e27e072117b7cbadd9f2c82edf486800f7..6ddfb09bbc6a31cac7b91db147c4b7859a1bff8d 100644 (file)
--- a/README
+++ b/README
@@ -331,20 +331,12 @@ MINTTL
 NSNAME                 Origin server (default: hostname of your machine)
 MAINTNAME              Domain maintainer name (default: root@NSNAME)
 
-BIND_OPTIONS           Extra options to put to the options { ... } section of named.conf
-
 For the timing parameters, the following shortcuts are available:
 
 HOURS(n)               Convert hours to seconds
 MINUTES(n)             Convert minutes to seconds
 DAYS(n)                        Convert days to seconds
 
-For the BIND_OPTIONS, we offer:
-
-FORWARD(ip...)         Try to ask the given name servers first to see if they
-                       have the reply cached.
-SLAVE(ip...)           Pass all non-local requests to the given name servers.
-
 
 5. Makefile targets
 ~~~~~~~~~~~~~~~~~~~

diff --git a/m4/dnslib.m4 b/m4/dnslib.m4
index 3e796a3ac91ddb9cbd74e73d10e97f6c2943a2e7..f6fc63ce503a1cb8580be395ca26bef4536500d5 100644 (file)
--- a/m4/dnslib.m4
+++ b/m4/dnslib.m4
@@ -87,8 +87,6 @@ define(`nsc_fatal_error', `errprint(`NSC error: $1
 
 define(`NAMED_RESTART_CMD', `ndc reload')
 
-define(`BIND_OPTIONS', `       # Other options can be added here via macro `BIND_OPTIONS'')
-
 define(`ROOT', `/etc/named')
 define(`CFDIR', `cf')
 define(`ZONEDIR', `zone')

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