Commit f3df168c authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

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
...@@ -298,7 +298,9 @@ else { ...@@ -298,7 +298,9 @@ else {
# #
if (!$verify) { if (!$verify) {
# If its the user himself, then we can generate a new authkeys file. # If its the user himself, then we can generate a new authkeys file.
if (!$target_user->SameUser($this_user) && !TBAdmin()) { # 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"); fatal("You are not allowed to set pubkeys for $target_user\n");
} }
if (-d "$HOMEDIR/$user_uid/.ssh") { if (-d "$HOMEDIR/$user_uid/.ssh") {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# EMULAB-COPYRIGHT # 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. # All rights reserved.
# #
use English; use English;
...@@ -463,7 +463,7 @@ sub AddUser() ...@@ -463,7 +463,7 @@ sub AddUser()
if ($?) { if ($?) {
fatal("Could not create initial encrypted SSL certificate"); fatal("Could not create initial encrypted SSL certificate");
} }
$target_user->Update({'initial_passphrase' => undef}); $target_user->Update({'initial_passphrase' => "NULL"});
} }
if ($nocollabtools) { if ($nocollabtools) {
......
Supports Markdown
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