allow InitHandler to work during apache startup

[freeside.git] / FS / FS / UID.pm

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 7891019..15f15a1 100644 (file)
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -73,7 +73,7 @@ sub forksuidsetup {
   $user = shift;
   croak "fatal: adminsuidsetup called without arguements" unless $user;
 
-  $user =~ /^([\w\-\.]+)/ or croak "fatal: illegal user $user";
+  $user =~ /^([\w\-\.]+)$/ or croak "fatal: illegal user $user";
   $user = $1;
 
   $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
@@ -83,7 +83,7 @@ sub forksuidsetup {
   $ENV{'ENV'} = '';
   $ENV{'BASH_ENV'} = '';
 
-  croak "Not running uid freeside!" unless checkeuid();
+  croak "Not running uid freeside!" unless checkeuid() || !$>;
   getsecrets;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
                           'AutoCommit' => 0,
@@ -92,6 +92,7 @@ sub forksuidsetup {
 
   foreach ( keys %callback ) {
     &{$callback{$_}};
+    # breaks multi-database installs # delete $callback{$_}; #run once
   }
 
   $dbh;
@@ -230,7 +231,7 @@ sub getsecrets {
   die "No user!" unless $user;
   my($conf) = new FS::Conf $conf_dir;
   my($line) = grep /^\s*$user\s/, $conf->config('mapsecrets');
-  die "User not found in mapsecrets!" unless $line;
+  die "User $user not found in mapsecrets!" unless $line;
   $line =~ /^\s*$user\s+(.*)$/;
   $secrets = $1;
   die "Illegal mapsecrets line for user?!" unless $secrets;
@@ -255,7 +256,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.13 2002-02-23 02:14:25 jeff Exp $
+$Id: UID.pm,v 1.17 2002-07-03 11:10:12 ivan Exp $
 
 =head1 BUGS