Correctly handle named files.

firewall/bin/firewall-blacklist

@@ -520,13 +520,13 @@ sub expireBlacklist
     #
     #  Remove any blacklisted IP which is now on our whitelist.
     #
-    foreach my $file ( sort ( glob( "$CONFIG{'whitelist'}/*" ) ) )
+    foreach my $file ( sort ( glob( "$CONFIG{'blacklist'}/*" ) ) )
     {
         #
         #  Get the IP
         #
         my $ip = $file;
-        if ( $ip =~ /(.*)\/(.*)$/ )
+        if ( $ip =~ /(.*)\/(.*)\.auto$/i )
         {
             $ip = $2;
         }

firewall/debian/changelog

+bytemark-vhost-firewall (20090812171748) stable; urgency=low
+
+  * Correctly handle mis-named blacklisted files.
+
+ -- Steve Kemp <steve@bytemark.co.uk>  Wed, 12 Aug 2009 17:17:48 +0000
+
 bytemark-vhost-firewall (20090812162548) stable; urgency=low
 
   * Remove active blacklist entries for IPs which are subsequently