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

* 'master' of /home/mdw/public-git/firewall:
  local.m4: Put the default network stanza at the end.
  local.m4: Note terror's participation in the VPN.

diff --git a/metalzone.m4 b/metalzone.m4
index eb4dd2bf27bd26050f561e4d886403dceb93a7f6..c9a35730afbdc95d2a625effbddfeb1896178082 100644 (file)
--- a/metalzone.m4
+++ b/metalzone.m4
@@ -46,6 +46,7 @@ allowservices inbound tcp \
        gnutella_svc \
        ftp ftp_data \
        rsync \
+       imaps \
        http https \
        git     
 allowservices inbound udp \

diff --git a/numbers.m4 b/numbers.m4
index da3ee59517dd1250db52203633cb6097cd328fa0..18ab0461f6b2a4eb1afb1559cd500986beb2eeba 100644 (file)
--- a/numbers.m4
+++ b/numbers.m4
@@ -38,6 +38,7 @@ defport ident 113
 defport https 443
 defport syslog 514                     # UDP only!
 defport rsync 873
+defport imaps 993
 defport squid 3128
 defport tripe 4070
 defport iodine 5353