Commit fa4cf33f authored by Leigh B Stoller's avatar Leigh B Stoller

Add "passphrase" to newuser args, set to the user's desired password.

This will cause an initial encrypted SSL certificate to be created when
the account is approved.
parent 478d1521
......@@ -466,10 +466,8 @@ elseif (! array_key_exists($formfields["profile"], $profile_array)) {
#
if ($this_user) {
if (! $this_user->HasEncryptedCert(1)) {
$url = CreateURL("gensslcert", $this_user);
$errors["error"] = "Oops, registered Emulab users must create a ".
"<a href='$TBBASE/$url'>ssl certificate</a> first";
$errors["error"] =
"Oops, registered users are supposed to have an SSL certificate";
}
}
else {
......
......@@ -340,6 +340,8 @@ if (!$this_user) {
$args["shell"] = 'tcsh';
$args["affiliation"] = $formfields["affiliation"];
$args["password"] = $formfields["password1"];
# Force initial SSL cert generation.
$args["passphrase"] = $formfields["password1"];
# Flag to the backend.
$args["genesis"] = ($ISAPT ? "aptlab" : "cloudlab");
......
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