local.m4: Fix whitespace oddity.

[firewall] / vampire.m4

diff --git a/vampire.m4 b/vampire.m4
index 6ddbbf5..ed9bd9b 100644 (file)
--- a/vampire.m4
+++ b/vampire.m4
@@ -22,43 +22,27 @@
 ### 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
 ## Externally visible services.
 allowservices inbound tcp \
-       finger ident \
-       dns iodine \
+       ident \
        ssh \
-       smtp submission \
-       gnutella_svc \
-       ftp ftp_data \
-       rsync \
-       imaps \
-       disorder mpd \
-       http https squid \
-       git \
        tor_public tor_directory i2p
 allowservices inbound udp \
-       dns iodine \
        tripe \
        gnutella_svc \
        i2p
 
 ## 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 \
+       lpd \
        netbios_ssn microsoft_ds
 allowservices inbound-untrusted udp \
        dns \
@@ -75,7 +59,16 @@ run iptables -A OUTPUT -m multiport \
 
 ## Other interesting things.
 dnsresolver inbound
+dnsserver inbound
 ntpclient inbound $ntp_servers
 
+## Provide NTP service to untrusted clients.
+iptables -A inbound -p udp -j ACCEPT \
+       --source-port 123 --destination-port 123 \
+       -s 172.29.198.0/23
+ip6tables -A inbound -p udp -j ACCEPT \
+       --source-port 123 --destination-port 123 \
+       -s 2001:470:9740::/48
+
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------