From c463da07ef97b754c7fcba0b154517e0b004f797 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 11 Feb 2015 18:20:14 -0800
Subject: [PATCH] remove vestigial code for ancient multi-db/mapsecrets
 operation

---
 FS/FS/UID.pm | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 9c52f0883..f41735d4e 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -74,7 +74,6 @@ sub adminsuidsetup {
 
 sub forksuidsetup {
   my $user = shift;
-  my $olduser = $user;
   warn "$me forksuidsetup starting for $user\n" if $DEBUG;
 
   if ( $FS::CurrentUser::upgrade_hack ) {
@@ -88,7 +87,7 @@ sub forksuidsetup {
 
   env_setup();
 
-  db_setup($olduser);
+  db_setup();
 
   callback_setup();
 
@@ -118,16 +117,11 @@ sub env_setup {
 }
 
 sub db_setup {
-  my $olduser = shift;
-
   croak "Not running uid freeside (\$>=$>, \$<=$<)\n" unless checkeuid();
 
   warn "$me forksuidsetup connecting to database\n" if $DEBUG;
-  if ( $FS::CurrentUser::upgrade_hack && $olduser ) {
-    $dbh = &myconnect($olduser);
-  } else {
-    $dbh = &myconnect();
-  }
+  $dbh = &myconnect();
+
   warn "$me forksuidsetup connected to database with handle $dbh\n" if $DEBUG;
 
   warn "$me forksuidsetup loading schema\n" if $DEBUG;
-- 
2.11.0