Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
172386d1
Commit
172386d1
authored
May 25, 2016
by
Leigh B Stoller
Browse files
Do not call tbacct from ModUserInfo() on unapproved users, it is enough to
update the DB only.
parent
b4a93183
Changes
1
Hide whitespace changes
Inline
Side-by-side
db/User.pm.in
View file @
172386d1
...
...
@@ -851,6 +851,7 @@ sub ModUserInfo($$$$)
my
$
target_name
=
$
target_user
->
name
();
my
$
target_email
=
$
target_user
->
email
();
my
$
wikionly
=
$
target_user
->
wikionly
();
my
$
status
=
$
target_user
->
status
();
my
%
mods
;
my
$
noreport
;
...
...
@@ -1023,8 +1024,12 @@ sub ModUserInfo($$$$)
#
# "tbacct mod" updates the user gecos field (usr_name) and shell.
# But do not want to do this if the user is unapproved, since there
# is no account to operate on until the user is approved. Really,
# we need a better test for actual user account.
#
if ($mods{"usr_name"} || $mods{"usr_shell"}) {
if ($status ne $USERSTATUS_UNAPPROVED &&
($mods{"usr_name"} || $mods{"usr_shell"})) {
my $cmd = "$tbacct mod $target_uid";
##print $cmd;
my $cmd_out = `$cmd`;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment