have the UI use full country names, and state names outside the US...

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

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 3d893ee..83b652b 100644 (file)
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -98,7 +98,7 @@ sub forksuidsetup {
 }
 
 sub myconnect {
-  $dbh = DBI->connect( getsecrets, {'AutoCommit' => 0, 'ChopBlanks' => 1, } )
+  DBI->connect( getsecrets, {'AutoCommit' => 0, 'ChopBlanks' => 1, } )
     or die "DBI->connect error: $DBI::errstr\n";
 }
 
@@ -262,7 +262,7 @@ sub getsecrets {
   $secrets = $1;
   die "Illegal mapsecrets line for user?!" unless $secrets;
   ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
-    or die "Can't get secrets: $!";
+    or die "Can't get secrets: $secrets: $!\n";
   $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";
   undef $driver_name;
   ($datasrc, $db_user, $db_pass);