Merge branch 'master' into emergency

[firewall] / vampire.m4

diff --git a/vampire.m4 b/vampire.m4
index 4e00a49..acd2008 100644 (file)
--- a/vampire.m4
+++ b/vampire.m4
@@ -48,8 +48,8 @@ allowservices inbound udp \
 
 ## Extend some services to local untrusted hosts.
 clearchain inbound-untrusted
-run iptables -A inbound -j inbound-untrusted \
-       -s 172.29.198.0/24
+run iptables -A inbound -j inbound-untrusted -s $net_inet_untrusted
+run ip6tables -A inbound -j inbound-untrusted -s $net_inet6_untrusted
 
 allowservices inbound-untrusted tcp \
        dns \