Commit 6c7b91de authored by Leigh Stoller's avatar Leigh Stoller

SSH keys is now optional for guest users; web based ssh only

if they do not provide a key.
parent e2794107
......@@ -335,12 +335,6 @@ if (!defined($geniuser)) {
fatal("User $user_uid exists in the local user table");
}
#
# New users must have a key.
#
if (!defined($sshkey)) {
UserError("You must supply an ssh key!");
}
print "Geni user does not exist; creating one ...\n"
if ($debug);
......
......@@ -321,14 +321,11 @@ if (!$this_user) {
}
}
}
# Existing guest users are allowed to resuse their ssh key, but can supply
# a new one if they want.
if (!isset($formfields["sshkey"]) || $formfields["sshkey"] == "") {
if (!($geniuser || $this_user)) {
$errors["sshkey"] = "Missing Field";
}
}
else {
#
# SSH keys are now optional for guest users; they just have to
# use the web based ssh windo.
#
if (isset($formfields["sshkey"]) && $formfields["sshkey"] != "") {
$args["sshkey"] = $formfields["sshkey"];
}
......
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