diff options
author | ivan <ivan> | 2006-07-13 23:45:38 +0000 |
---|---|---|
committer | ivan <ivan> | 2006-07-13 23:45:38 +0000 |
commit | f140958fe1464e629e763d6613a6e481068d17ff (patch) | |
tree | 638a34537cbb417d1433f81f8293b08af340f029 /FS/FS/UID.pm | |
parent | 779ca0263837bebf7f0ab6f45cb8381706049658 (diff) |
mapsecrets file shouldn't be necessary at all...
Diffstat (limited to 'FS/FS/UID.pm')
-rw-r--r-- | FS/FS/UID.pm | 17 |
1 files changed, 12 insertions, 5 deletions
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"; |