Index: branches/stable/assign.html
===================================================================
--- branches/stable/assign.html	(revision 156)
+++ branches/stable/assign.html	(revision 158)
@@ -31,5 +31,5 @@
 <td>Route/allocate from this master:&nbsp;</td><td>$$MASTERLIST$$</td>
 </tr><tr class="color1">
-<td>Cicruit ID:&nbsp;</td><td><input name=circid size=40></td>
+<td>Circuit ID:&nbsp;</td><td><input name=circid size=40></td>
 </tr><tr class="color2">
 <td>Description/Name:&nbsp;</td><td><input name="desc" size=40></td>
Index: branches/stable/cgi-bin/IPDB.pm
===================================================================
--- branches/stable/cgi-bin/IPDB.pm	(revision 156)
+++ branches/stable/cgi-bin/IPDB.pm	(revision 158)
@@ -7,5 +7,5 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2004 - Kris Deugau
+# Copyright (C) 2004,2005 - Kris Deugau
 
 package IPDB;
Index: branches/stable/cgi-bin/MyIPDB.pm
===================================================================
--- branches/stable/cgi-bin/MyIPDB.pm	(revision 158)
+++ branches/stable/cgi-bin/MyIPDB.pm	(revision 158)
@@ -0,0 +1,22 @@
+# ipdb/cgi-bin/MyIPDB.pm
+# Contains site-specific functions for IPDB
+# May override some functions from IPDB.pm, wraps others
+###
+# SVN revision info
+# $Date$
+# SVN revision $Rev$
+# Last update by $Author$
+###
+# Copyright (C) 2004,2005 - Kris Deugau
+
+use IPDB 2.0 qw(:ALL);
+
+## connectDB_My()
+# Wrapper for IPDB::connectDB
+# Takes no arguments, returns whatever IPDB::connectDB returns.
+sub connectDB_My {
+  return connectDB("ipdb", "ipdb", "ipdbpwd");
+} # end connectDB_My()
+
+# Keep Perl from complaining.
+1;
Index: branches/stable/cgi-bin/admin.cgi
===================================================================
--- branches/stable/cgi-bin/admin.cgi	(revision 156)
+++ branches/stable/cgi-bin/admin.cgi	(revision 158)
@@ -9,4 +9,5 @@
 # Last update by $Author$
 ###
+# Copyright (C) 2004,2005 - Kris Deugau
 
 use strict;
Index: branches/stable/cgi-bin/consistency-check.pl
===================================================================
--- branches/stable/cgi-bin/consistency-check.pl	(revision 156)
+++ branches/stable/cgi-bin/consistency-check.pl	(revision 158)
@@ -10,8 +10,8 @@
 
 use DBI;
-use IPDB 2.0 qw(:ALL);
+use MyIPDB;
 use NetAddr::IP;
 
-($dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
+($dbh,$errstr) = connectDB_My;
 
 # Schlep up the masters
Index: branches/stable/cgi-bin/extras/db2rwhois.pl
===================================================================
--- branches/stable/cgi-bin/extras/db2rwhois.pl	(revision 156)
+++ branches/stable/cgi-bin/extras/db2rwhois.pl	(revision 158)
@@ -10,4 +10,5 @@
 # Last update by $Author$
 ###
+# Copyright (C) 2004,2005 - Kris Deugau
 
 use strict;
@@ -15,5 +16,5 @@
 use DBI;
 use NetAddr::IP;
-use IPDB qw(:ALL);
+use MyIPDB;
 
 $ENV{"PATH"} = "/bin;/usr/bin";
@@ -29,5 +30,8 @@
 #		);
 
-my $dbh = connectDB;
+my ($dbh,$msg) = connectDB_My;
+
+# For WHOIS purposes this may not be very useful.  YMMV, we'll see.
+#initIPDBGlobals($dbh);
 
 my @masterblocks;
Index: branches/stable/cgi-bin/freespace.pl
===================================================================
--- branches/stable/cgi-bin/freespace.pl	(revision 156)
+++ branches/stable/cgi-bin/freespace.pl	(revision 158)
@@ -8,11 +8,11 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2004 - Kris Deugau
+# Copyright (C) 2004,2005 - Kris Deugau
 
 use DBI;
-use IPDB 2.0 qw(:ALL);
+use MyIPDB;
 use NetAddr::IP;
 
-($dbh,errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
+($dbh,$errstr) = connectDB_My;
 
 print "Content-type: text/plain\n\n";
Index: branches/stable/cgi-bin/main.cgi
===================================================================
--- branches/stable/cgi-bin/main.cgi	(revision 156)
+++ branches/stable/cgi-bin/main.cgi	(revision 158)
@@ -14,5 +14,5 @@
 use DBI;
 use CommonWeb qw(:ALL);
-use IPDB 2.0 qw(:ALL);
+use MyIPDB;
 use CustIDCK;
 use POSIX qw(ceil);
@@ -38,5 +38,5 @@
 my $sth;
 my $errstr;
-($ip_dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
+($ip_dbh,$errstr) = connectDB_My;
 if (!$ip_dbh) {
   printAndExit("Failed to connect to database: $errstr\n");
Index: branches/stable/cgi-bin/newcity.cgi
===================================================================
--- branches/stable/cgi-bin/newcity.cgi	(revision 156)
+++ branches/stable/cgi-bin/newcity.cgi	(revision 158)
@@ -15,5 +15,5 @@
 use DBI;
 use CommonWeb qw(:ALL);
-use IPDB 2.0 qw(:ALL);
+use MyIPDB;
 #use POSIX qw(ceil);
 use NetAddr::IP;
@@ -34,5 +34,5 @@
 cleanInput(\%webvar);
 
-my ($dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
+my ($dbh,$errstr) = connectDB_My;
 my $sth;