Commit 77177447 authored by Leigh Stoller's avatar Leigh Stoller

When we are a GENIRACK, elabman gets a real password so that GMOC can

log in and poke around.
parent 786aef4f
......@@ -54,6 +54,7 @@ my $MAILMANSUPPORT= @MAILMANSUPPORT@;
my $THISHOMEBASE= "@THISHOMEBASE@";
my $PROTOUSER = 'elabman';
my $ELABINELAB = @ELABINELAB@;
my $GENIRACK = @PROTOGENI_GENIRACK@;
my $SAMBANODE = "fs"; # DNS makes this do the right thing in E-in-E.
my $SMBPASSWD = "/usr/local/bin/smbpasswd";
......@@ -419,7 +420,7 @@ sub AddUser()
#
# Leave the password "starred" on elabinelab; safer.
#
if (!$ELABINELAB) {
if (!$ELABINELAB || $GENIRACK) {
# shell escape.
$pswd =~ s/\$/\\\$/g;
$pswd =~ s/\*/\\\*/g;
......@@ -679,7 +680,7 @@ sub UpdatePassword()
# Change on ops only if there is a real account there.
# For ELABINELAB, safer to leave the password "starred".
#
if (!$wikionly && !$ELABINELAB) {
if (!$wikionly && (!$ELABINELAB || $GENIRACK)) {
#
# Grab from the DB to avoid taint checking sillyness.
#
......
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