X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=m4%2Fdnslib.m4;h=b09d4d1df669b7deba93e8172eb3b06250cbf4e8;hb=2c5837136158422b198dd306e66f71c4db87182f;hp=0c74b459102c3cf97c803f3542ba7056d5e8cc19;hpb=747c80cf4a1294d69e8905c349d796e472768c16;p=nsc-5.git

diff --git a/m4/dnslib.m4 b/m4/dnslib.m4
index 0c74b45..b09d4d1 100644
--- a/m4/dnslib.m4
+++ b/m4/dnslib.m4
@@ -1,12 +1,12 @@
 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
 
-define(`NSCVER', `NSC 2.99a')
+define(`NSCVER', `NSC 3.1')
 
 # 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_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
@@ -86,15 +85,16 @@ define(`nsc_fatal_error', `errprint(`NSC error: $1
 
 # Default values of parameters
 
-define(`NAMED_RESTART_CMD', `ndc reload')
-
-define(`BIND_OPTIONS', `	# Other options can be added here via macro `BIND_OPTIONS'')
+define(`NAMED_RESTART_CMD', `rndc reload')
 
 define(`ROOT', `/etc/named')
 define(`CFDIR', `cf')
 define(`ZONEDIR', `zone')
 define(`BAKDIR', `bak')
 define(`VERSDIR', `ver')
+define(`HASHDIR', `hash')
+define(`KEYDIR', `keys')
+define(`DSSDIR', `dss')
 define(`ROOTCACHE', `root.cache')
 
 define(`REFRESH', HOURS(8))
@@ -105,6 +105,9 @@ define(`NSNAME', translit(esyscmd(`hostname -f'),`
 ',`'))
 define(`MAINTNAME', `root'.`nsc_corr_dot(NSNAME)')
 
+define(`KEYGEN_OPTIONS', `-a RSASHA256 -b 1024')
+define(`SIGNZONE_OPTIONS', `-e +'DAYS(365))
+
 # And finally we change comments to semicolons to be compatible with the zone files
 
 changecom(;)