More v3.0 work.

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

diff --git a/m4/nsc.m4 b/m4/nsc.m4
index ad6fa7697806100823034475b86e753eebd357cb..32cb79319020480e01c31592cd991c6f5a7b3c6f 100644 (file)
--- a/m4/nsc.m4
+++ b/m4/nsc.m4
@@ -29,10 +29,7 @@ define(nsc_abs_name, `ifelse(CURRENT_NAME, translit(CURRENT_NAME,.,:), CURRENT_N
 
 # SOA record
 
-define(nsc_SOA, `divert; Primary file for the CURRENT_DOMAIN domain
-; Generated by NSCVER (nsc.m4) on CURRENT_DATE
-; Please do not edit manually
-
+define(nsc_SOA, `
 $ORIGIN CURRENT_DOMAIN
 $TTL   MINTTL
 nsc_emit_name  `SOA'   nsc_corr_dot(NSNAME) MAINTNAME (
@@ -120,7 +117,7 @@ define(HI, `nsc_emit_name   HINFO   "$1" "$2"')
 
 define(nsc_ALIAS, `$1  `CNAME' CURRENT_NAME
 ')
-define(ALIAS, `nsc_iterate(`nsc_ALIAS', $@)dnl')
+define(ALIAS, `nsc_iterate(`nsc_ALIAS', $@)nsc_set_name(CURRENT_NAME)dnl')
 
 # CNAME records
 
@@ -139,6 +136,13 @@ define(REVBLOCK, `nsc_forloop(`i', $2, $3, `i'     `CNAME' `i'.$1
 # Cleanup actions
 
 define(nsc_cleanup, `ifdef(`DISABLE_LOCALHOST',,`
+; Added automatically (required by RFC 1912)
 localhost      A       127.0.0.1
 ')')
 m4wrap(`nsc_cleanup')
+
+divert(0)dnl
+`;;;' Primary zone file
+`;;;' Generated by NSCVER (nsc.m4) on CURRENT_DATE
+`;;;' Please do not edit manually
+`'