From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 7 Mar 2011 11:06:51 +0000 (+0000)
Subject: Merge branch 'master' of /home/mdw/public-git/firewall
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/firewall/commitdiff_plain/f2cfcfa875be6c08dbcc21fe31ca8fed89224bd3?hp=deee94301a9892b3568cd134756ef73e825bf148

Merge branch 'master' of /home/mdw/public-git/firewall

* 'master' of /home/mdw/public-git/firewall:
  vampire: Allow outside access to squid.
  vampire: Allow SMB from the untrusted network.
---

diff --git a/metalzone.m4 b/metalzone.m4
index eb4dd2b..3d6129a 100644
--- a/metalzone.m4
+++ b/metalzone.m4
@@ -42,10 +42,11 @@ m4_divert(82)m4_dnl
 allowservices inbound tcp \
 	finger ident \
 	ssh \
-	smtp \
+	smtp submission \
 	gnutella_svc \
 	ftp ftp_data \
 	rsync \
+	imaps \
 	http https \
 	git	
 allowservices inbound udp \
diff --git a/numbers.m4 b/numbers.m4
index 8092e72..124ed80 100644
--- a/numbers.m4
+++ b/numbers.m4
@@ -41,7 +41,9 @@ defport netbios_ssn 139
 defport https 443
 defport microsoft_ds 445
 defport syslog 514			# UDP only!
+defport submission 587
 defport rsync 873
+defport imaps 993
 defport squid 3128
 defport tripe 4070
 defport iodine 5353