[Fusionforge-commits] FusionForge branch master updated. f11d48048f0cfca9d855cc97725cccd48b306624

Roland Mas lolando at libremir.placard.fr.eu.org
Fri May 29 11:43:05 CEST 2015


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, master has been updated
       via  f11d48048f0cfca9d855cc97725cccd48b306624 (commit)
       via  5881e92ac282bb4a43e3df1f473972aff684c44d (commit)
       via  b7e32529d1b7c0a9fdb5e9ba31d099726ded0344 (commit)
      from  e56214ed60046a748252d6b108530fd781421bc2 (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 -----------------------------------------------------------------
commit f11d48048f0cfca9d855cc97725cccd48b306624
Merge: e56214e 5881e92
Author: Roland Mas <lolando at debian.org>
Date:   Fri May 29 10:20:11 2015 +0200

    Merge branch '6.0'


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

Summary of changes:
 src/plugins/authldap/common/AuthLDAPPlugin.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/authldap/common/AuthLDAPPlugin.class.php b/src/plugins/authldap/common/AuthLDAPPlugin.class.php
index a9ca642..cf05962 100644
--- a/src/plugins/authldap/common/AuthLDAPPlugin.class.php
+++ b/src/plugins/authldap/common/AuthLDAPPlugin.class.php
@@ -192,7 +192,7 @@ into the FusionForge database.");
 
 		$u->setMD5Passwd ($mapped_data['md5_password']);
 		if ((substr($mapped_data['unix_password'], 0, 7) == '{crypt}') 
-			|| substr($mapped_data['unix_password'], 0, 7) == '{CRYPT}')) {
+			|| substr($mapped_data['unix_password'], 0, 7) == '{CRYPT}') {
 			$mapped_data['unix_password'] = substr($mapped_data['unix_password'],7);
 		}
 		$u->setUnixPasswd ($mapped_data['unix_password']);


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list