The unified diff between revisions [ba381432..] and [3a2250fb..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'client/plugins/iptables.py'

#
#
# patch "client/plugins/iptables.py"
#  from [1b153de261ff6843afbed6103461f9fdb4e7c9d8]
#    to [3b9ba4f31ddf2daa7e23e12aeedcc8e9e7ae8869]
#
============================================================
--- client/plugins/iptables.py	1b153de261ff6843afbed6103461f9fdb4e7c9d8
+++ client/plugins/iptables.py	3b9ba4f31ddf2daa7e23e12aeedcc8e9e7ae8869
@@ -1,9 +1,14 @@ import os

 import os
+from phonehome import urgency
+from config import install_path

 def run():
     # for now, just check that there are rules
     iptables_command = '/sbin/iptables -L INPUT -n'
+
+    if os.access(os.path.join(install_path, 'etc', 'no_iptables_ok'), os.R_OK):
+        return [(urgency['info'], 'skipped iptables check, no_firewall_ok found.')]

     fd = os.popen(iptables_command)
     result = fd.read()
@@ -13,4 +18,4 @@ def run():
     if line_count > 3:
 	return []
     else:
+	return [(urgency['warning'], 'no iptables rules in chain "INPUT"')]
-	return [("medium", 'no iptables rules in chain "INPUT"')]