*** empty log message ***

[freeside.git] / site_perl / UID.pm

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index c9ecd8f..c141cab 100644 (file)
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -78,7 +78,7 @@ sub adminsuidsetup {
                           'ChopBlanks' => 'true',
   } ) or die "DBI->connect error: $DBI::errstr\n";
 
-  swapuid(); #go to non-privledged user if running setuid freeside
+  #swapuid(); #go to non-privledged user if running setuid freeside
 
   foreach ( keys %callback ) {
     &{$callback{$_}};
@@ -200,7 +200,7 @@ Swaps real and effective UIDs.
 =cut
 
 sub swapuid {
-  ($<,$>) = ($>,$<);
+  ($<,$>) = ($>,$<) if $< != $>;
 }
 
 =item getsecrets [ USER ]
@@ -223,7 +223,7 @@ sub getsecrets {
   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);
 }
 
@@ -239,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.7 1999-01-18 09:22:40 ivan Exp $
+
 =head1 BUGS
 
 Too many package-global variables.
@@ -283,7 +287,13 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
-Revision 1.5  1998-11-15 00:51:51  ivan
+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