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

diff --git a/m4/dnslib.m4 b/m4/dnslib.m4
index b09d4d1..414aa65 100644
--- a/m4/dnslib.m4
+++ b/m4/dnslib.m4
@@ -1,12 +1,12 @@
 dnl ###
 dnl ### NSC -- Library Functions For DNS Processing
-dnl ### (c) 1997--2011 Martin Mares <mj@ucw.cz>
+dnl ### (c) 1997--2019 Martin Mares <mj@ucw.cz>
 dnl ###
 divert(-1)
 
 # NSC version
 
-define(`NSCVER', `NSC 3.1')
+define(`NSCVER', `NSC 5.0')
 
 # Current date and time
 
@@ -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',
@@ -87,15 +92,8 @@ define(`nsc_fatal_error', `errprint(`NSC error: $1
 
 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))
 define(`RETRY', HOURS(2))
@@ -107,6 +105,7 @@ 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