ACL bootstrapping

2 files changed, 8 insertions, 3 deletions

diff --git a/FS/FS/CurrentUser.pm b/FS/FS/CurrentUser.pm
index 13d34167d..37ed3592a 100644
--- a/FS/FS/CurrentUser.pm
+++ b/FS/FS/CurrentUser.pm
@@ -1,11 +1,13 @@
 package FS::CurrentUser;
 
-use vars qw($CurrentUser);
+use vars qw($CurrentUser $upgrade_hack);
 
 #not at compile-time, circular dependancey causes trouble
 #use FS::Record qw(qsearchs);
 #use FS::access_user;
 
+$upgrade_hack = 0;
+
 =head1 NAME
 
 FS::CurrentUser - Package representing the current user
@@ -19,8 +21,9 @@ FS::CurrentUser - Package representing the current user
 sub load_user {
   my( $class, $user ) = @_; #, $pass
 
-  #XXX remove me at some point
-  return "" if $user =~ /^fs_(queue|selfservice)$/;
+  return "" if $upgrade_hack;
+
+  #return "" if $user =~ /^fs_(queue|selfservice)$/;
 
   #not the best thing in the world...
   eval "use FS::Record qw(qsearchs);";
diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 25d883fcf..a1212ae98 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -5,6 +5,7 @@ use vars qw($DEBUG $DRY_RUN);
 use Term::ReadKey;
 use DBIx::DBSchema 0.31;
 use FS::UID qw(adminsuidsetup checkeuid datasrc );  #getsecrets);
+use FS::CurrentUser;
 use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
 
 $DEBUG = 1;
@@ -12,6 +13,7 @@ $DEBUG = 1;
 die "Not running uid freeside!" unless checkeuid();
 
 my $user = shift or die &usage;
+$FS::CurrentUser::upgrade_hack = 1;
 my $dbh = adminsuidsetup($user);
 
 #needs to match FS::Schema...