First step to version 3.0. Changes too extensive to comment them.

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

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index a729eba93aba4b8b5dc112b95a02ab0a453ef75f..0b4c96112271886ddd5858d4014f96c11dd2e873 100644 (file)
--- a/m4/mkconf.m4
+++ b/m4/mkconf.m4
@@ -1,17 +1,21 @@
 dnl ###
-dnl ### NSC 2.2 -- BIND Config File Builder
-dnl ### (c) 1997--1999 Martin Mares <mj@ucw.cz>
+dnl ### NSC -- BIND Config File Builder
+dnl ### (c) 1997--2003 Martin Mares <mj@ucw.cz>
 dnl ###
+include(m4/dnslib.m4)
 
-# Definition of primary domain
+# Definition of primary domains
 
-define(`PRIMARY', `divert(0)zone "$1" in {
+define(`DO_PRIMARY', `divert(0)zone "$1" in {
        type master;
-       file "ZONEDIR/$1";
+       file "ZONEDIR/$2";
 };
 
 divert(-1)')
 
+define(`PRIMARY', `DO_PRIMARY($1,$1)')
+define(`REVERSE', `DO_PRIMARY(REV($1),nsc_if_v6($1,`nsc_revblock6($1)',`nsc_revaddr($1)'))')
+
 # Definition of secondary domain
 
 define(`SECONDARY', `divert(0)zone "$1" in {
@@ -22,20 +26,6 @@ define(`SECONDARY', `divert(0)zone "$1" in {
 
 divert(-1)')
 
-# Definition of reverse domain
-
-define(`REVERSE', `divert(0)zone "revaddr($1).in-addr.arpa" in {
-       type master;
-       file "ZONEDIR/revaddr($1)";
-};
-
-divert(-1)')
-
-# Definition of reverse sub-domain
-
-define(`PARTIAL', `SECONDARY(revaddr($1).in-addr.arpa,$3)')
-define(`PREVERSE', `REVERSE($1)')
-
 # Definition of forwarders for both normal and slave mode
 
 define(`FORWard', `patsubst(`$@',`,',`; ')')
@@ -53,25 +43,24 @@ divert(-1)')
 define(`CONFIG', `divert(0)$1
 divert(-1)')
 
-# BIND options
+# The preamble
+
+divert(0)dnl
+`#'
+`#'    BIND configuration file
+`#'    Generated by NSCVER (mkconf.m4) on CURRENT_DATE
+`#'    Please don't edit manually
+`#'
 
-define(`OPTIONS', `divert(0)options {
+options {
        directory "ROOT";
        interface-interval 0;
-$1};
+BIND_OPTIONS
+};
 
 zone "." in {
        type hint;
-       file "root.cache";
+       file "ROOTCACHE";
 };
 
-divert(-1)')
-
-divert(0)dnl
-`#'
-`#'    Name server configuration file
-`#'    Generated by mkconf.m4 on curdate
-`#'    Please don't edit manually
-`#'
-
 divert(-1)