A new script for releasing NSC

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

diff --git a/m4/dnslib.m4 b/m4/dnslib.m4
index 0c74b459102c3cf97c803f3542ba7056d5e8cc19..6cdb921c95b2c355eb4207b3fa7b541fe9563128 100644 (file)
--- a/m4/dnslib.m4
+++ b/m4/dnslib.m4
@@ -1,12 +1,12 @@
 dnl ###
 dnl ###

-dnl ### NSC 3.0 -- Library Functions For DNS Processing
-dnl ### (c) 1997--2003 Martin Mares <mj@ucw.cz>
+dnl ### NSC -- Library Functions For DNS Processing
+dnl ### (c) 1997--2011 Martin Mares <mj@ucw.cz>

 dnl ###
 divert(-1)
 
 # NSC version
 
 dnl ###
 divert(-1)
 
 # NSC version
 

-define(`NSCVER', `NSC 2.99a')
+define(`NSCVER', `NSC 3.1')

 
 # Current date and time
 
 
 # Current date and time
 


@@ -37,8 +37,7 @@ define(nsc_corr_dot, `ifelse(substr($1,decr(len($1))),.,$1,$1`'ifelse(index($1,.
 
 define(nsc_if_v6, `ifelse(index($1,:),-1,`$3',`$2')')
 
 
 define(nsc_if_v6, `ifelse(index($1,:),-1,`$3',`$2')')
 

-define(nsc_norm_v6, `nsc_norm_v6_z(dnl
-ifelse(regexp($1,`::.*::'),-1,`ifelse(index($1,::),-1,`nsc_norm_v6_nn($1)',`nsc_norm_v6_cc($1)')',`nsc_bad_v6($1)'))')
+define(nsc_norm_v6, `nsc_norm_v6_z(ifelse(regexp($1,`::.*::'),-1,`ifelse(index($1,::),-1,`nsc_norm_v6_nn($1)',`nsc_norm_v6_cc($1)')',`nsc_bad_v6($1)'))')

 # If there is no ::, check the number of :'s
 define(nsc_norm_v6_nn, `ifelse(nsc_extract_colons($1),:::::::,$1,`nsc_bad_v6($1)')')
 # Replace :: by the right number of :'s to get 8 (possibly empty) components
 # If there is no ::, check the number of :'s
 define(nsc_norm_v6_nn, `ifelse(nsc_extract_colons($1),:::::::,$1,`nsc_bad_v6($1)')')
 # Replace :: by the right number of :'s to get 8 (possibly empty) components


@@ -88,13 +87,12 @@ define(`nsc_fatal_error', `errprint(`NSC error: $1
 
 define(`NAMED_RESTART_CMD', `ndc reload')
 
 
 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')
 define(`BAKDIR', `bak')
 define(`VERSDIR', `ver')
 define(`ROOT', `/etc/named')
 define(`CFDIR', `cf')
 define(`ZONEDIR', `zone')
 define(`BAKDIR', `bak')
 define(`VERSDIR', `ver')

+define(`HASHDIR', `hash')

 define(`ROOTCACHE', `root.cache')
 
 define(`REFRESH', HOURS(8))
 define(`ROOTCACHE', `root.cache')
 
 define(`REFRESH', HOURS(8))