X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/f54dd5ce2ae0a3a39ab6520ea898a6a62a280ad8..be02ca0e993b0c72598579216f07c952d8f2e6fd:/Makefile

diff --git a/Makefile b/Makefile
index 69191ed..6c4427f 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ ZONESETS		+= distorted
 
 distorted_VIEWS		 = inside outside
 distorted_outside_NETS	 = dmz jump
-distorted_inside_NETS	 = any unsafe colo vpn
+distorted_inside_NETS	 = any unsafe colo vpn upn
 
 distorted_all_ZONES	+= distorted.org.uk
 
@@ -162,13 +162,13 @@ ALL_ZONEDIFFS = $(foreach s,$(ZONESETS), \
 	$(foreach v,$($s_VIEWS), \
 	  $(foreach z,$($s_all_ZONES) $($s_$v_ZONES), \
 	    $v/$z.zonediff)))
-run-nsdiff = nsdiff -d -v "" $2 \
+run-nsdiff = nsdiff -v "" $2 \
 	$($($(call notdir,$1)_ZONESET)_$(call dir-nosl,$1)_NSDIFF) \
 	$(call notdir,$1) $1.zone
 $(ALL_ZONEDIFFS) : %.zonediff : %.zone
 	$(call v_tag,NSDIFF)$(call run-nsdiff,$*,-q); \
 	rc=$$?; case $$rc in 1) $(call run-nsdiff,$*); rc=$$? ;; esac; \
-	case $$rc in 0 | 1) : ;; *) exit $$? ;; esac
+	case $$rc in 0 | 1) : ;; *) exit $$rc ;; esac
 diff: $(ALL_ZONEDIFFS)
 
 ## Finally we have to install the zone files.