From: ivan <ivan>
Date: Thu, 13 Jul 2006 23:45:38 +0000 (+0000)
Subject: mapsecrets file shouldn't be necessary at all...
X-Git-Tag: BEFORE_FINAL_MASONIZE~83
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=f140958fe1464e629e763d6613a6e481068d17ff

mapsecrets file shouldn't be necessary at all...
---

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 21df9441b..45701edb8 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -267,11 +267,18 @@ sub getsecrets {
   $user = $setuser if $setuser;
   die "No user!" unless $user;
   my($conf) = new FS::Conf $conf_dir;
-  my($line) = grep /^\s*($user|\*)\s/, $conf->config('mapsecrets');
-  die "User $user not found in mapsecrets!" unless $line;
-  $line =~ /^\s*($user|\*)\s+(.*)$/;
-  $secrets = $2;
-  die "Illegal mapsecrets line for user?!" unless $secrets;
+
+  if ( $conf->exists('mapsecrets') ) {
+    my($line) = grep /^\s*($user|\*)\s/, $conf->config('mapsecrets');
+    die "User $user not found in mapsecrets!" unless $line;
+    $line =~ /^\s*($user|\*)\s+(.*)$/;
+    $secrets = $2;
+    die "Illegal mapsecrets line for user?!" unless $secrets;
+  } else {
+    # no mapsecrets file at all, so do the default thing
+    $secrets = 'secrets';
+  }
+
   ($datasrc, $db_user, $db_pass) = $conf->config($secrets)
     or die "Can't get secrets: $secrets: $!\n";
   $FS::Conf::default_dir = $conf_dir. "/conf.$datasrc";