config.m4: Fix the nameservers following network renumbering.

[dnserr] / Makefile

diff --git a/Makefile b/Makefile
index acdd754..802cd43 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ all:
 DUMMY                   = refused wrong-ds
 DUMMYZONES              = $(addsuffix .zone,$(DUMMY))
 TARGETS                        += $(DUMMYZONES)
-$(DUMMYZONES): %.zone: utils.m4 dummy.in
+$(DUMMYZONES): %.zone: utils.m4 config.m4 dummy.in
        m4 -P -DBASE=$(BASE) >$@.new utils.m4 dummy.in
        mv $@.new $@
 
@@ -57,16 +57,29 @@ dnserr.zone.sigold: dnserr.zone key/$(ZONE).stamp
 
 TARGETS                        += dnserr.zone.sig
 OLDSIGMATCH             = $$1 == "expired-rrsig.$(ZONE)." && \
-                               $$4 == "RRSIG" && $$5 == "A"
+                               $$4 == "RRSIG" && ($$5 == "A" || $$5 == "AAAA")
 BADSIGMATCH             = $$1 == "invalid-rrsig.$(ZONE)." && \
-                               $$4 == "RRSIG" && $$5 == "A"
+                               $$4 == "RRSIG" && ($$5 == "A" || $$5 == "AAAA")
 CLEAN                  += t.oldsig
 dnserr.zone.sig: dnserr.zone.sigold dnserr.zone.signew
        awk '$(OLDSIGMATCH) { print; }' \
                dnserr.zone.sigold >t.oldsig
-       awk '$(OLDSIGMATCH) { system("cat t.oldsig"); next; } \
-               { gsub(/invalid-rrsigx/, "invalid-rrsig"); print; }' \
-       dnserr.zone.signew >$@.new
+       awk '$(OLDSIGMATCH) { \
+               if (!doneoldsig) { system("cat t.oldsig"); doneoldsig = 1; } \
+               next; \
+            } \
+            $(BADSIGMATCH) { \
+               s = $$13; \
+               for (i = length(s)/2; i > 0; i--) { \
+                 c = substr(s, i, 1); \
+                 if (c != tolower(c)) { c = tolower(c); break; } \
+                 else if (c != toupper(c)) { c = toupper(c); break; } \
+               } \
+               $$13 = substr(s, 1, i - 1) c substr(s, i + 1); \
+            } \
+            { print; }' \
+               dnserr.zone.signew >$@.new
+       rm t.oldsig
        mv $@.new $@
 
 CLEAN                  += $(TARGETS)
@@ -76,3 +89,5 @@ all: $(TARGETS)
 clean::; rm -f $(CLEAN)
 realclean:: clean; rm -f $(REALCLEAN)
 .PHONY: clean realclean
+
+-include local.mk