typo

[freeside.git] / site_perl / UID.pm

diff --git a/site_perl/UID.pm b/site_perl/UID.pm
index 77c40aa..156bd30 100644 (file)
--- a/site_perl/UID.pm
+++ b/site_perl/UID.pm
@@ -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 "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;
   $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: $!";
   ($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);
 }
 
   ($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'};
 
     $coderef = sub { warn "Hi, I'm returning your call!" };
     $FS::UID::callback{'Package::Name'};
 

+=head1 VERSION
+
+$Id: UID.pm,v 1.6 1998-11-15 05:27:48 ivan Exp $
+

 =head1 BUGS
 
 Too many package-global variables.
 =head1 BUGS
 
 Too many package-global variables.


@@ -282,7 +287,13 @@ inlined suidsetup
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $
 ivan@sisd.com 98-sep-12
 
 $Log: UID.pm,v $

-Revision 1.4  1998-11-13 09:56:52  ivan
+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.)
 
 change configuration file layout to support multiple distinct databases (with
 own set of config files, export, etc.)