Released 3.0.1 with a bug fix for SLAVE and FORWARD.

diff --git a/NEWS b/NEWS
index 25d8eb0b3c62469ae8f134916995443ca0709130..e49127d844be95e3623aaac583ad7438e0963fdd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Version 3.0.1  [22-11-2006]
+
+  Fixed a minor bug in the FORWARD and SLAVE macros, causing it to
+  generate bogus output with certain versions of M4.
+
 Version 3.0  [20-02-2005]
 
   One year of testing should be good enough, so releasing 2.99b as 3.0

diff --git a/README b/README
index 89496f93b990dc35bbd92d7350f2aab1e6e209f2..e468dbed8ab474ac8a3d80884bb98bcdad2465ca 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
-            Domain Name Server Configuration Utilities -- NSC 3.0
+           Domain Name Server Configuration Utilities -- NSC 3.0.1
 
-                   (c) 1997--2005 Martin Mares <mj@ucw.cz>
+                   (c) 1997--2006 Martin Mares <mj@ucw.cz>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/cf.dist/a.example.com b/cf.dist/a.example.com
index 7911c2029b4a871ba1cc5433eb8aeabcc94a53f1..2a0026b892bb8d0216deafac359c2a7e3455e0d7 100644 (file)
--- a/cf.dist/a.example.com
+++ b/cf.dist/a.example.com
@@ -24,3 +24,6 @@ DADDR(jabb)
 
 H(jabberwock, jabb)
 H(this-one-is-classless-reverse-delegated, 10.3.0.65)
+
+undefine(`dnl')
+H(dnl, jabb)

diff --git a/m4/mkconf.m4 b/m4/mkconf.m4
index 131424ffb9d021c65caa09fd2cd45e16f6cac761..25fc1eb2e93d4c0a3aab61edb5303ce15c7f9e4d 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)
 
@@ -30,7 +30,7 @@ divert(-1)')
 
 # Definition of forwarders for both normal and slave mode
 
-define(`FORWard', `patsubst(`$@',`,',`; ')')
+define(`FORWard', `patsubst(`$*',`,',`; ')')
 define(`FORWArd', `divert(0)   forward $1;
        forwarders { FORWard(shift($@),)};
 divert(-1)')