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 eb4dd2bf27bd26050f561e4d886403dceb93a7f6..3d6129abc0fc02f28dd2483296978bedfbe167ff 100644 (file)
--- 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 8092e72f634cca978f8954e9d9e8bd749f54320a..124ed806d0b9e5eb68fb8da2b937e1d644546c8e 100644 (file)
--- 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