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

diff --git a/m4/dnslib.m4 b/m4/dnslib.m4
index 0c74b45..f6fc63c 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--2008 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
@@ -88,8 +87,6 @@ define(`nsc_fatal_error', `errprint(`NSC error: $1
 
 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')