Commit f3df168c authored by Leigh Stoller's avatar Leigh Stoller

Minor fix to previous revision; allow the internal ssh key to be added

from tbacct, which happens in the context of the project/group root,
not as the user.
parent 54f08ddf
......@@ -297,8 +297,10 @@ else {
# Check user
#
if (!$verify) {
# If its the user himself, then we can generate a new authkeys file.
if (!$target_user->SameUser($this_user) && !TBAdmin()) {
# If its the user himself, then we can generate a new authkeys file.
# Assume nodelete option comes from internal script, so do not worry.
if (!$target_user->SameUser($this_user) && !$this_user->IsAdmin() &&
!$nodelete) {
fatal("You are not allowed to set pubkeys for $target_user\n");
}
if (-d "$HOMEDIR/$user_uid/.ssh") {
......
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -463,7 +463,7 @@ sub AddUser()
if ($?) {
fatal("Could not create initial encrypted SSL certificate");
}
$target_user->Update({'initial_passphrase' => undef});
$target_user->Update({'initial_passphrase' => "NULL"});
}
if ($nocollabtools) {
......
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