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 --cc numbers.m4
index 241e774,8092e72..124ed80
--- 1/numbers.m4
--- 2/numbers.m4
+++ b/numbers.m4
@@@ -35,11 -35,13 +35,15 @@@ defport bootpc 6
  defport finger 79
  defport http 80
  defport ident 113
+ defport netbios_ns 137
+ defport netbios_dgm 138
+ 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