bookends.m4: Configure IPv6 router advertisement stuff.

[firewall] / vampire.m4

diff --git a/vampire.m4 b/vampire.m4
index 6ddbbf5..b3257c7 100644 (file)
--- a/vampire.m4
+++ b/vampire.m4
@@ -22,13 +22,6 @@
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ###--------------------------------------------------------------------------
-### Config settings.
-
-## This router is involved in a routing asymmetry.
-setconf(rp_filter, 0)
-setconf(log_martians, 0)
-
-###--------------------------------------------------------------------------
 ### vampire-specific rules.
 
 m4_divert(86)m4_dnl
@@ -54,8 +47,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 \