X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=m4%2Fdnslib.m4;h=5c43bc6cdb54bc5011f31bd155b0aefe862a976e;hb=57e60f9a9bd96a6cd81651dfd8b833ea82c509c6;hp=3e796a3ac91ddb9cbd74e73d10e97f6c2943a2e7;hpb=702c59e0e8d95d2798f798123fb03319d6a84957;p=nsc-5.git

diff --git a/m4/dnslib.m4 b/m4/dnslib.m4
index 3e796a3..5c43bc6 100644
--- a/m4/dnslib.m4
+++ b/m4/dnslib.m4
@@ -1,6 +1,6 @@
 dnl ###
 dnl ### NSC -- Library Functions For DNS Processing
-dnl ### (c) 1997--2008 Martin Mares <mj@ucw.cz>
+dnl ### (c) 1997--2011 Martin Mares <mj@ucw.cz>
 dnl ###
 divert(-1)
 
@@ -70,6 +70,11 @@ define(nsc_iterate, `define(`nsc_iter', defn(`$1'))nsc_itera(shift($@))')
 
 define(REV, `nsc_if_v6($1,`nsc_revblock6($1).ip6.arpa',`nsc_revaddr($1).in-addr.arpa')')
 
+# DNSSEC wrapper
+
+define(`USE_DNSSEC')
+define(`DNSSEC', `define(`USE_DNSSEC',1)$1define(`USE_DNSSEC')')
+
 # A for loop macro from m4 doc
 
 define(`nsc_forloop',
@@ -85,14 +90,9 @@ define(`nsc_fatal_error', `errprint(`NSC error: $1
 
 # Default values of parameters
 
-define(`NAMED_RESTART_CMD', `ndc reload')
+define(`NAMED_RESTART_CMD', `rndc 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(`ROOTCACHE', `root.cache')
 
@@ -104,6 +104,10 @@ 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))
+define(`DSFROMKEY_OPTIONS', `')
+
 # And finally we change comments to semicolons to be compatible with the zone files
 
 changecom(;)