X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/193f386b6081567bf43fcbc6bf9b9842d2c645bc..refs/heads/master:/artist.m4

diff --git a/artist.m4 b/artist.m4
index 2997769..23195aa 100644
--- a/artist.m4
+++ b/artist.m4
@@ -31,20 +31,15 @@ allowservices inbound tcp \
 	ident \
 	ftp ftp_data \
 	http https \
-	disorder \
+	disorder disorder2 \
 	tor_public tor_directory i2p
 allowservices inbound udp \
 	i2p
 
 ## Allow smb and nmb to untrusted hosts.
-run iptables -A inbound -j ACCEPT \
-	-s 172.29.198.0/24 \
+run ip46tables -A inbound-untrusted -j ACCEPT \
 	-p udp -m multiport --destination-ports \
-		$port_netbios_ns,$port_netbios_dgm
-run iptables -A inbound -j ACCEPT \
-	-s 172.29.198.0/24 \
-	-p tcp -m multiport --destination-ports \
-		$port_netbios_ssn,$port_microsoft_ds
+	$port_netbios_ns,$port_netbios_dgm
 
 ## Open ports for Rygel.
 run iptables -A inbound -j ACCEPT -s 172.29.198.0/23 -p igmp