Index: trunk/dnsbl/extract-data
===================================================================
--- trunk/dnsbl/extract-data	(revision 7)
+++ trunk/dnsbl/extract-data	(revision 8)
@@ -206,44 +206,47 @@
 
 # Yahoo! may ... yadda yadda yadda  (geeze they've got a whack of netblocks for mail...)
-  #IP-Network                    98.136.0.0/14
-  #IP-Network-Block              098.136.000.000 - 098.139.255.255
-  #Org-Name                      Yahoo! Inc.
+ #IP-Network                    98.136.0.0/14
   my $yahoo1 = new NetAddr::IP "98.136.0.0/14";
   next if $relayip->within($yahoo1);
-  #IP-Network                    66.196.64.0/18
-  #IP-Network-Block              066.196.064.000 - 066.196.127.255
-  #Org-Name                      Inktomi Corporation
-  # Inktomi ~~ Yahoo!
+ #IP-Network                    66.196.64.0/18
+ #Org-Name                      Inktomi Corporation
+ # Inktomi ~~ Yahoo!
   my $yahoo2 = new NetAddr::IP "66.196.64.0/18";
   next if $relayip->within($yahoo2);
-  #IP-Network                    67.195.0.0/16
-  #IP-Network-Block              067.195.000.000 - 067.195.255.255
-  #Org-Name                      Yahoo! Inc.
+ #IP-Network                    67.195.0.0/16
   my $yahoo3 = new NetAddr::IP "67.195.0.0/16";
   next if $relayip->within($yahoo3);
-  #IP-Network                    69.147.64.0/18
-  #IP-Network-Block              069.147.064.000 - 069.147.127.255
-  #Org-Name                      Yahoo! Inc.
+ #IP-Network                    69.147.64.0/18
   my $yahoo4 = new NetAddr::IP "69.147.64.0/18";
   next if $relayip->within($yahoo4);
-  #IP-Network                    206.190.32.0/19
-  #IP-Network-Block              206.190.032.000 - 206.190.063.255
-  #Org-Name                      Yahoo! Broadcast Services, Inc.
+ #IP-Network                    206.190.32.0/19
+ #Org-Name                      Yahoo! Broadcast Services, Inc.
   my $yahoo5 = new NetAddr::IP "206.190.32.0/18";
   next if $relayip->within($yahoo5);
-  #IP-Network                    68.142.192.0/18
-  #IP-Network-Block              068.142.192.000 - 068.142.255.255
-  #Org-Name                      Inktomi Corporation
+ #IP-Network                    68.142.192.0/18
+ #Org-Name                      Inktomi Corporation
   my $yahoo6 = new NetAddr::IP "68.142.192.0/18";
   next if $relayip->within($yahoo6);
-  #IP-Network                    216.252.96.0/19
-  #IP-Network-Block              216.252.096.000 - 216.252.127.255
-  #Org-Name                      Yahoo! Inc.
+ #IP-Network                    216.252.96.0/19
   my $yahoo7 = new NetAddr::IP "216.252.96.0/19";
   next if $relayip->within($yahoo7);
-  #inetnum:      124.83.128.0 - 124.83.255.255
-  #descr:        Yahoo! Japan
+ #inetnum:      124.83.128.0 - 124.83.255.255
   my $yahoo8 = new NetAddr::IP "124.83.128.0/17";
   next if $relayip->within($yahoo8);
+ #inetnum:        217.146.184.0 - 217.146.191.47
+  my $yahoo9 = new NetAddr::IP "217.146.184.0/21";
+  next if $relayip->within($yahoo9);
+ #inetnum:      124.108.96.0 - 124.108.111.255
+  my $yahoo10 = new NetAddr::IP "124.108.96.0/20";
+  next if $relayip->within($yahoo10);
+ #IP-Network                    76.13.0.0/16
+  my $yahoo11 = new NetAddr::IP "76.13.0.0/16";
+  next if $relayip->within($yahoo11);
+ #IP-Network                    68.180.128.0/17
+  my $yahoo12 = new NetAddr::IP "68.180.128.0/17";
+  next if $relayip->within($yahoo12);
+ #IP-Network                    209.191.64.0/18
+  my $yahoo13 = new NetAddr::IP "209.191.64.0/18";
+  next if $relayip->within($yahoo13);
 
 # and the same goes for Bell Canada.  *le sigh*
@@ -294,12 +297,12 @@
 }
 foreach my $uri (sort keys %urilist) {
-  if ($opts{u}) {
-    my @hout = qx { host $uri.multi.uribl.com; host $uri.uribl.company.com };
-    if ($hout[0] =~ /NXDOMAIN/ && $hout[1] =~ /NXDOMAIN/) {
+  my @hout = qx { host $uri.multi.uribl.com; host $uri.uribl.company.com };
+  if ($hout[0] =~ /NXDOMAIN/ && $hout[1] =~ /NXDOMAIN/) {
+    if ($opts{u}) {
       print "+$uri.uribl.company.com:127.0.0.2:900:::\n";
+    } else {
+      # URI plus count
+      print "$uri\t$urilist{$uri}\n";
     }
-  } else {
-    # URI plus count
-    print "$uri: $urilist{$uri}\n";
   }
 }