Bug 2092657 - Validating redhat.com accounts fails for valid aliases

Only validate enabled accounts.

Change-Id: I47fc434660050fc1651eb7ae9dde1b21d34e617b

1 files changed, 4 insertions, 5 deletions

diff --git a/extensions/RedHat/Extension.pm b/extensions/RedHat/Extension.pm
index 34ccf248d..40829efbf 100644
--- a/extensions/RedHat/Extension.pm
+++ b/extensions/RedHat/Extension.pm
@@ -4242,15 +4242,12 @@ sub object_end_of_update {
   # Note that this is a made-up class, for this example.
   if ($object->isa('Bugzilla::User')) {
 
-    my $valid = _validate_redhat_addr($object->login);
-
     if (defined $changes->{'name'}) {
       my ($old, $new) = @{$changes->{'name'}};
       print "The name field changed from $old to $new!";
     }
 
-    if ( !$valid
-      && !$object->is_bot
+    if ( !$object->is_bot
       && Bugzilla->user->login ne Bugzilla->params->{system_user})
     {
       my ($old_dt, $new_dt);
@@ -4261,8 +4258,10 @@ sub object_end_of_update {
         if (defined $changes->{'disable_mail'});
 
       if ($object->is_enabled || $object->email_enabled) {
+        my $valid = _validate_redhat_addr($object->login);
+
         ThrowUserError('cannot_update_invalid_redhat_mail',
-          {account => $object->login});
+          {account => $object->login}) unless($valid);
       }
     }
   }