Commit 988bc9c2 authored by Leigh Stoller's avatar Leigh Stoller

Do not set geniuser to admin,unapproved during emulab-install.

parent 73dd2af0
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -496,9 +496,11 @@ my $usr_email = $newuser->email();
my $firstinitstate;
if (TBGetSiteVar("general/firstinit/state", \$firstinitstate)) {
#
# The first user gets admin status and some extra groups, etc.
# These initial users gets admin status and some extra groups, etc.
#
if ($firstinitstate eq "createproject") {
if ($firstinitstate eq "createproject" &&
($new_uid eq EmulabConstants::PROTOUSER() ||
$new_uid eq EmulabConstants::CKUPUSER())) {
DBQueryFatal("update users set ".
" admin=1,status='". $User::USERSTATUS_UNAPPROVED . "' " .
"where uid_idx='$usr_idx'");
......
......@@ -210,7 +210,7 @@ use vars qw(@ISA @EXPORT);
TB_NODEHISTORY_OP_FREE TB_NODEHISTORY_OP_ALLOC TB_NODEHISTORY_OP_MOVE
PROTOUSER TB_NODEHISTORY_OP_CREATE TB_NODEHISTORY_OP_DESTROY
PROTOGENI_SUPPORT PROTOGENI_GENIRACK
PROTOGENI_SUPPORT PROTOGENI_GENIRACK CKUPUSER
);
use English;
......@@ -266,6 +266,7 @@ sub NFREELOCKED_EID() { "nfree-locked"; }
sub TBOPSPID() { $TBOPSPID; }
sub EXPTLOGNAME() { $EXPTLOGNAME; }
sub PROTOUSER() { 'elabman'; }
sub CKUPUSER() { 'elabckup'; }
sub PROTOGENI_SUPPORT() { @PROTOGENI_SUPPORT@; }
sub PROTOGENI_GENIRACK() { @PROTOGENI_GENIRACK@; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment