--flush always works

firewall/bin/firewall

@@ -334,26 +334,17 @@ foreach my $entry (@outgoing)
 
 
 #
-#  Is the firewall disabled?
-#
-if ( -e "/etc/symbiosis/firewall/disabled" )
-{
-    unlink($tempfile);
-    unlink( $CONFIG{ 'lock' } );
-    exit;
-}
-
-
-#
-#  Flush the existing rules.
+#  Flush the existing rules - unless we shouldn't.
 #
 flushAllRules() unless ( $CONFIG{ 'no-flush' } );
 
 
 #
-#  Did the user just want to flush the rules?  If so exit now
+#  Now if the firewall is disabled, or the user requested a flush
+# then we'll do that and exit.
 #
-if ( $CONFIG{ 'flush' } )
+if ( ( $CONFIG{ 'flush' } ) ||
+     ( -e "/etc/symbiosis/firewall/disabled" ) )
 {
     unlink($tempfile);
     unlink( $CONFIG{ 'lock' } );

firewall/debian/changelog

+symbiosis-firewall (2010:1109) stable; urgency=low
+
+  * Always allow --flush to succeed.
+
+ -- Steve Kemp <steve@bytemark.co.uk>  Tue, 9 Nov 2010 17:18:19 +0000
+
 symbiosis-firewall (2010:0915) stable; urgency=low
 
   * Don't re-run the firewall unless we've genuinely removed