X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=site_perl%2FUID.pm;h=b4486c1e861f175c078bb986530ce3ce719449ac;hb=de46aa575f3e726a9b005172706cff5e542955fd;hp=77c40aad531f8c3c84c405fb166b1591f020430d;hpb=0bf5ad9ff0a65195db88ed0bac3aa11c33ec1ad3;p=freeside.git

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index 77c40aad5..b4486c1e8 100644
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -200,7 +200,7 @@ Swaps real and effective UIDs.
 =cut
 
 sub swapuid {
-  ($<,$>) = ($>,$<);
+  ($<,$>) = ($>,$<) if $< != $>;
 }
 
 =item getsecrets [ USER ]
@@ -217,12 +217,13 @@ 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;
   $line =~ /^\s*$user\s+(.*)$/;
   $secrets = $1;
-  die "User not found in mapsecrets file!" unless $secrets;
+  die "Illegal mapsecrets line for user?!" unless $secrets;
   ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
     or die "Can't get secrets: $!";
-  $FS::Conf::default_dir .= "/conf.$datasrc";
+  $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
   ($datasrc, $db_user, $db_pass);
 }
 
@@ -238,6 +239,10 @@ coderef into the hash %FS::UID::callback :
     $coderef = sub { warn "Hi, I'm returning your call!" };
     $FS::UID::callback{'Package::Name'};
 
+=head1 VERSION
+
+$Id: UID.pm,v 1.8 1999-02-23 07:23:23 ivan Exp $
+
 =head1 BUGS
 
 Too many package-global variables.
@@ -282,7 +287,19 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.4  1998-11-13 09:56:52  ivan
+Revision 1.8  1999-02-23 07:23:23  ivan
+oops, don't comment out &swapuid in &adminsuidsetup!
+
+Revision 1.7  1999/01/18 09:22:40  ivan
+changes to track email addresses for email invoicing
+
+Revision 1.6  1998/11/15 05:27:48  ivan
+bugfix for new configuration layout
+
+Revision 1.5  1998/11/15 00:51:51  ivan
+eliminated some warnings on certain fatal errors (well, it is less confusing)
+
+Revision 1.4  1998/11/13 09:56:52  ivan
 change configuration file layout to support multiple distinct databases (with
 own set of config files, export, etc.)