Fix test failures

[chef.git] / cookbooks / exim / recipes / default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 219baa36d45c7d7d61b98a7b5672c982720ab4f9..dbf90bdfb4554397df2cb54b0295214089da10d8 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -234,7 +234,7 @@ if node[:exim][:smarthost_name]
       action :accept
       source "net"
       dest "fw"
-      proto "tcp:syn"
+      proto "tcp"
       dest_ports port
       source_ports "1024-65535"
     end
@@ -254,9 +254,10 @@ else
       family :inet
       source "net:#{smarthosts_inet.sort.join(',')}"
       dest "fw"
-      proto "tcp:syn"
+      proto "tcp"
       dest_ports port
       source_ports "1024-65535"
+      not_if { smarthosts_inet.empty? }
     end
 
     firewall_rule "accept-inbound-smtp-#{port}" do
@@ -264,9 +265,10 @@ else
       family :inet6
       source "net:#{smarthosts_inet6.sort.join(',')}"
       dest "fw"
-      proto "tcp:syn"
+      proto "tcp"
       dest_ports port
       source_ports "1024-65535"
+      not_if { smarthosts_inet6.empty? }
     end
   end
 end
@@ -276,7 +278,7 @@ if node[:exim][:smarthost_via]
     action :reject
     source "fw"
     dest "net"
-    proto "tcp:syn"
+    proto "tcp"
     dest_ports "smtp"
   end
 end