X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUID.pm;h=15f15a171c8bc01b390e7801759fe52b2a0e3c87;hp=78fe156c3d1f9cd79e80d17a339bc51f2eb7b77b;hb=98567e531e90ee1c7c195d5f1e708898d47a8452;hpb=fb697ebf8016ab1fa33de81a2a6b46f2bc7f1c1d

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 78fe156c3..15f15a171 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -73,6 +73,9 @@ sub forksuidsetup {
   $user = shift;
   croak "fatal: adminsuidsetup called without arguements" unless $user;
 
+  $user =~ /^([\w\-\.]+)$/ or croak "fatal: illegal user $user";
+  $user = $1;
+
   $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
   $ENV{'SHELL'} = '/bin/sh';
   $ENV{'IFS'} = " \t\n";
@@ -80,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,
@@ -89,6 +92,7 @@ sub forksuidsetup {
 
   foreach ( keys %callback ) {
     &{$callback{$_}};
+    # breaks multi-database installs # delete $callback{$_}; #run once
   }
 
   $dbh;
@@ -227,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;
@@ -252,7 +256,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.12 2002-01-19 15:16:22 ivan Exp $
+$Id: UID.pm,v 1.17 2002-07-03 11:10:12 ivan Exp $
 
 =head1 BUGS