X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUID.pm;h=04b9620e26f1c2e2ac9559b4b1c28a5694e2802b;hb=e7227ac94d51a4830c0908174bdf8468deaac176;hp=f670051519151aa70ca05ea6e184027b10aff9b3;hpb=0ebeec96313dd7edfca340f01f8fbbbac1f4aa1d;p=freeside.git

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index f67005151..04b9620e2 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -16,7 +16,7 @@ use FS::Conf;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(checkeuid checkruid cgisuidsetup adminsuidsetup forksuidsetup
-                getotaker dbh datasrc getsecrets driver_name );
+                getotaker dbh datasrc getsecrets driver_name myconnect );
 
 $freeside_uid = scalar(getpwnam('freeside'));
 
@@ -84,11 +84,8 @@ sub forksuidsetup {
   $ENV{'BASH_ENV'} = '';
 
   croak "Not running uid freeside!" unless checkeuid();
-  getsecrets;
-  $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
-                          'AutoCommit' => 0,
-                          #'ChopBlanks' => 1,
-  } ) or die "DBI->connect error: $DBI::errstr\n";
+
+  $dbh = &myconnect;
 
   foreach ( keys %callback ) {
     &{$callback{$_}};
@@ -100,6 +97,11 @@ sub forksuidsetup {
   $dbh;
 }
 
+sub myconnect {
+  $dbh = DBI->connect( getsecrets, {'AutoCommit' => 0, 'ChopBlanks' => 1, } )
+    or die "DBI->connect error: $DBI::errstr\n";
+}
+
 =item install_callback
 
 A package can install a callback to be run in adminsuidsetup by passing
@@ -195,7 +197,9 @@ Returns the current Freeside user.
 =cut
 
 sub getotaker {
-  $user;
+  #$user;
+  #stupid kludge until schema otaker fields are not 8 chars
+  substr($user,0,8);
 }
 
 =item cgisetotaker