Index: trunk/cgi-bin/extras/db2rwhois.pl
===================================================================
--- trunk/cgi-bin/extras/db2rwhois.pl	(revision 855)
+++ trunk/cgi-bin/extras/db2rwhois.pl	(revision 856)
@@ -73,14 +73,14 @@
 # Also remove the details of our "reserved CORE/WAN" blocks;  they're not critical.
 my $ssth = $dbh->prepare(q(
-	SELECT cidr, custid, type, city, description, createstamp, modifystamp, swip
-	FROM allocations
+	SELECT a.cidr, a.custid, a.type, a.city, a.description, a.createstamp, a.modifystamp, a.swip, a.custid=t.def_custid AS isdef
+	FROM allocations a JOIN alloctypes t ON a.type=t.type
 	WHERE
-	NOT (cidr <<= '192.168.0.0/16') AND
-	NOT (cidr <<= '172.16.0.0/12') AND
-	NOT (cidr <<= '10.0.0.0/8') AND
-	NOT (type = 'wr' OR type = 'mm') AND
-	((masklen(cidr) <=30 AND family(cidr)=4) OR (masklen(cidr) <=64 AND family(cidr)=6)) AND
-	master_id = ? AND
-	cidr <<= ?
+	NOT (a.cidr <<= '192.168.0.0/16') AND
+	NOT (a.cidr <<= '172.16.0.0/12') AND
+	NOT (a.cidr <<= '10.0.0.0/8') AND
+	NOT (a.type = 'wr' OR a.type = 'mm') AND
+	((masklen(a.cidr) <=30 AND family(a.cidr)=4) OR (masklen(a.cidr) <=64 AND family(a.cidr)=6)) AND
+	a.master_id = ? AND
+	a.cidr <<= ?
 	) );
 
@@ -217,5 +217,5 @@
   # And now the subblocks
   $ssth->execute($mid, $master) or die "nosubs: $!\n".$dbh->errstr."\n";
-  while (my ($cidr, $custid, $type, $city, $desc, $ctime, $mtime, $swip) = $ssth->fetchrow_array) {
+  while (my ($cidr, $custid, $type, $city, $desc, $ctime, $mtime, $swip, $defcust) = $ssth->fetchrow_array) {
 
 # We get master block info from @masterblocks.
@@ -266,5 +266,5 @@
     my $netname = $netnameprefix{$type};
 
-    if ($swip eq 'n') {
+    if ($swip eq 'n' || $defcust) {
       print MASTERFILE "---\nID: NETBLK-$netnameprefix{mm}.$masterblocks[$i]\n".
 	"Auth-Area: $masterblocks[$i]\n".