From: Martin Mares <mj@ucw.cz>
Date: Wed, 22 Nov 2006 17:32:19 +0000 (+0000)
Subject: Released 3.0.1 with a bug fix for SLAVE and FORWARD.
X-Git-Tag: v4.0~38
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=770d2ff171502312e55dc391bdddc1879cf9fce9;p=nsc-5.git

Released 3.0.1 with a bug fix for SLAVE and FORWARD.
---

diff --git a/NEWS b/NEWS
index 25d8eb0..e49127d 100644
--- 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 89496f9..e468dbe 100644
--- 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 7911c20..2a0026b 100644
--- 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 131424f..25fc1eb 100644
--- 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)')