summaryrefslogtreecommitdiffstats
path: root/Bugzilla/User.pm
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2006-02-22 01:12:50 +0100
committerlpsolit%gmail.com <>2006-02-22 01:12:50 +0100
commit8ca103d253892761f81f66e186e5e584bcb9b6c3 (patch)
treeec18ae752dc47a2113237074bbb1b573d166b261 /Bugzilla/User.pm
parentedc8b211152a8e3bcb45f8ff089e3fead0fe1c51 (diff)
downloadbugzilla-8ca103d253892761f81f66e186e5e584bcb9b6c3.tar.gz
bugzilla-8ca103d253892761f81f66e186e5e584bcb9b6c3.tar.xz
Bug 327355: Email preferences are not set correctly when the user account is created by Env.pm - Patch by Frédéric Buclin <LpSolit@gmail.com> r=joel a=justdave
Diffstat (limited to 'Bugzilla/User.pm')
-rw-r--r--Bugzilla/User.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 19c45cbed..7288ab30e 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -1304,8 +1304,10 @@ sub insert_new_user {
$disabledtext ||= '';
# If not specified, generate a new random password for the user.
+ # If the password is '*', do not encrypt it; we are creating a user
+ # based on the ENV auth method.
$password ||= generate_random_password();
- my $cryptpassword = bz_crypt($password);
+ my $cryptpassword = ($password ne '*') ? bz_crypt($password) : $password;
# XXX - These should be moved into is_available_username or validate_email_syntax
# At the least, they shouldn't be here. They're safe for now, though.