diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 8c32a862b..02da76460 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -16,6 +16,7 @@ - fixed #10121: Q and A template doesn't work with default Forum Rich Editor - rfe #10423: Provide a way to access the instance of the thing that was added, modified, or deleted via workflow. (Eric Kennedy) - fixed #10486: Hardcoded extras in files in www/extras + - fixed: LDAP authentication does not check for failed passwords. Bug added to 7.7.10. 7.7.9 - fixed #10266: Public Profile overrides Able to be friend diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm index 0c62455d0..c63b55645 100644 --- a/lib/WebGUI/Auth/LDAP.pm +++ b/lib/WebGUI/Auth/LDAP.pm @@ -180,7 +180,7 @@ sub authenticate { # Authentication failed if ($auth->code == 48 || $auth->code == 49){ - $self->SUPER::authenticationError; + $error .= $self->SUPER::authenticationError; } elsif ($auth->code > 0) { # Some other LDAP error happened $error .= '
  • LDAP error "'.$self->ldapStatusCode($auth->code).'" occured.'.$i18n->get(69).'
  • '; diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index fe8ceaf05..9321af0a9 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -125,7 +125,6 @@ sub authenticate { return 1; } $self->user(WebGUI::User->new($self->session,1)); - my $i18n = WebGUI::International->new($self->session); $self->SUPER::authenticationError; return 0; }