diff options
| -rw-r--r-- | FS/FS/UID.pm | 13 | ||||
| -rwxr-xr-x | FS/bin/freeside-setup | 6 |
2 files changed, 12 insertions, 7 deletions
diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm index 45701ed..1f51ca6 100644 --- a/FS/FS/UID.pm +++ b/FS/FS/UID.pm @@ -72,10 +72,15 @@ sub adminsuidsetup { sub forksuidsetup { $user = shift; - croak "fatal: adminsuidsetup called without arguements" unless $user; - $user =~ /^([\w\-\.]+)$/ or croak "fatal: illegal user $user"; - $user = $1; + if ( $FS::CurrentUser::upgrade_hack ) { + $user = ''; + } else { + croak "fatal: adminsuidsetup called without arguements" unless $user; + + $user =~ /^([\w\-\.]+)$/ or croak "fatal: illegal user $user"; + $user = $1; + } $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin'; $ENV{'SHELL'} = '/bin/sh'; @@ -265,10 +270,10 @@ the `/usr/local/etc/freeside/mapsecrets' file. sub getsecrets { my($setuser) = shift; $user = $setuser if $setuser; - die "No user!" unless $user; my($conf) = new FS::Conf $conf_dir; if ( $conf->exists('mapsecrets') ) { + die "No user!" unless $user; my($line) = grep /^\s*($user|\*)\s/, $conf->config('mapsecrets'); die "User $user not found in mapsecrets!" unless $line; $line =~ /^\s*($user|\*)\s+(.*)$/; diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup index 1380114..2ba717c 100755 --- a/FS/bin/freeside-setup +++ b/FS/bin/freeside-setup @@ -19,8 +19,8 @@ die "Not running uid freeside!" unless checkeuid(); # map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib; getopts("svd:"); -my $user = shift or die &usage; -getsecrets($user); +#my $user = shift or die &usage; +getsecrets(); #$user); #needs to match FS::Record my($dbdef_file) = "/usr/local/etc/freeside/dbdef.". datasrc; @@ -87,7 +87,7 @@ $dbdef->save($dbdef_file); ### $FS::CurrentUser::upgrade_hack = 1; -my $dbh = adminsuidsetup $user; +my $dbh = adminsuidsetup; #$user; #create tables $|=1; |