Index: trunk/cgi-bin/admin.cgi
===================================================================
--- trunk/cgi-bin/admin.cgi (revision 331)
+++ trunk/cgi-bin/admin.cgi (revision 340)
@@ -48,5 +48,6 @@
if ($IPDBacl{$authuser} !~ /A/) {
print "Content-Type: text/html\n\n".
- "Access denied\n".
+ "Access denied".
+ qq(\n).
'Access to this tool is restricted. Contact Kris '.
"for more information.\n";
@@ -60,5 +61,5 @@
"\n\n\tTEST [IPDB admin tools] TEST\n".
qq(\t\n).
- "\n\n".
+ qq(\n\n).
"IPDB - Administrative Tools
\n
\n";
Index: trunk/cgi-bin/extras/db2rwhois.pl
===================================================================
--- trunk/cgi-bin/extras/db2rwhois.pl (revision 331)
+++ trunk/cgi-bin/extras/db2rwhois.pl (revision 340)
@@ -42,7 +42,7 @@
# Techically, we only need to exclude 204.138.172.0/24, as we "own" all of the other blocks.
# However, 205.207.184.0/23 and 206.130.64.0/24 are, um, awkward.
- if ($data[0] =~ /^(192.168.0.0|172.16.0.0|10.0.0.0|20[456])/) {
- next GETMASTERS;
- }
+# if ($data[0] =~ /^(192.168.0.0|172.16.0.0|10.0.0.0|20[456])/) {
+# next GETMASTERS;
+# }
$masterblocks[$i] = new NetAddr::IP $data[0];
my ($ctime,undef) = split /\s/, $data[1];
@@ -98,7 +98,7 @@
$sth = $dbh->prepare("select cidr,custid,type,city,description,createstamp,modifystamp,swip ".
"from allocations 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 (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') and ".
"masklen(cidr) <=30");