This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, 6.0 has been updated
       via  0c9d820fc72d36a640a711186ca3d25159ac8caf (commit)
      from  8b6f06e9a92ce8876745ac1321ac05c108aa0a01 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0c9d820fc72d36a640a711186ca3d25159ac8caf

commit 0c9d820fc72d36a640a711186ca3d25159ac8caf
Author: Roland Mas <[email protected]>
Date:   Fri Apr 8 17:32:24 2016 +0200

    Better detection of inactive users

diff --git a/src/plugins/authldap/www/post-login.php 
b/src/plugins/authldap/www/post-login.php
index 73dfa3a..90eede8 100644
--- a/src/plugins/authldap/www/post-login.php
+++ b/src/plugins/authldap/www/post-login.php
@@ -92,7 +92,7 @@ if ($login) {
                } else {
                        $warning_msg = _('Missing Password Or User Name');
                }
-       } elseif ($u != NULL && $u->getStatus != 'A') {
+       } elseif ($u != NULL && ! $u->isError() && $u->getStatus() != 'A') {
             $warning_msg = _('User is inactive');
     } else {
             $warning_msg = _('LDAP server unreachable');

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/authldap/www/post-login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to