X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUID.pm;h=f81d8dcdda1ecdd4b0b82beb37ad4ce2e3ab4e91;hp=3e71f09f1eae7673376a6adf89430128171d4ad8;hb=44e51a5c50be350fa698bcdcf86ad5c01a7631a2;hpb=6ef34dda51afba96d8dc6c4dd72427c3d4003945 diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm index 3e71f09f1..f81d8dcdd 100644 --- a/FS/FS/UID.pm +++ b/FS/FS/UID.pm @@ -15,8 +15,8 @@ use DBI; use FS::Conf; @ISA = qw(Exporter); -@EXPORT_OK = qw(checkeuid checkruid cgisuidsetup - adminsuidsetup getotaker dbh datasrc getsecrets driver_name ); +@EXPORT_OK = qw(checkeuid checkruid cgisuidsetup adminsuidsetup forksuidsetup + getotaker dbh datasrc getsecrets driver_name ); $freeside_uid = scalar(getpwnam('freeside')); @@ -65,7 +65,11 @@ Returns the DBI database handle (usually you don't need this). =cut sub adminsuidsetup { + $dbh->disconnect if $dbh; + &forksuidsetup(@_); +} +sub forksuidsetup { $user = shift; croak "fatal: adminsuidsetup called without arguements" unless $user; @@ -78,7 +82,6 @@ sub adminsuidsetup { croak "Not running uid freeside!" unless checkeuid(); getsecrets; - $dbh->disconnect if $dbh; $dbh = DBI->connect($datasrc,$db_user,$db_pass, { 'AutoCommit' => 0, 'ChopBlanks' => 1, @@ -249,7 +252,7 @@ coderef into the hash %FS::UID::callback : =head1 VERSION -$Id: UID.pm,v 1.8 2001-08-21 09:34:13 ivan Exp $ +$Id: UID.pm,v 1.10 2001-09-24 03:23:34 ivan Exp $ =head1 BUGS