X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Fmapsecrets2access_user;h=945f130ef584bed85678aefc7e29d6efe883e3d1;hb=9270d54732d8cf73030555fdc32fa9ff929b22c2;hp=3fcd5069b8d0a99fc7505e6e582b4a62d73e79df;hpb=3489c3e13d952972c06b82d1eb2bbd0315ed5a7c;p=freeside.git

diff --git a/bin/mapsecrets2access_user b/bin/mapsecrets2access_user
index 3fcd5069b..945f130ef 100755
--- a/bin/mapsecrets2access_user
+++ b/bin/mapsecrets2access_user
@@ -14,7 +14,8 @@ use FS::access_groupagent;
 use FS::agent;
 
 $FS::CurrentUser::upgrade_hack = 1;
-adminsuidsetup shift;
+my $user = shift or die &usage;
+adminsuidsetup $user;
 
 my $supergroup = qsearchs('access_group', { 'groupname' => 'Superuser' } );
 unless ( $supergroup ) {
@@ -45,8 +46,10 @@ unless ( $supergroup ) {
 }
 my $supergroupnum = $supergroup->groupnum;
 
-my $mapsecrets = '/usr/local/etc/freeside/mapsecrets';
-open(MAPSECRETS, "<$mapsecrets") or die $!;
+my $conf = new FS::Conf;
+my $dir = $conf->base_dir;
+my $mapsecrets = "$dir/mapsecrets";
+open(MAPSECRETS, "<$mapsecrets") or die "Can't open $mapsecrets: $!";
 while (<MAPSECRETS>) {
   /([\w]+)\s+secrets\s*$/ or die "unparsable line in mapsecrets: $_";
   my $username = $1;
@@ -77,3 +80,8 @@ cp $mapsecrets, "$mapsecrets.bak$$";
 open(MAPSECRETS, ">$mapsecrets") or die $!;
 print MAPSECRETS '* secrets'. "\n";
 close MAPSECRETS or die $!;
+
+sub usage {
+  die "Usage:\n  mapsecrets2access_user user\n"; 
+}
+