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, Branch_5_3 has been updated
via 7b28eb7ee68cc5bb00bfc4419ccc5635e9a616f7 (commit)
from 9eecac4ed7c3432195f8a866fbfe8558f8b02558 (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 7b28eb7ee68cc5bb00bfc4419ccc5635e9a616f7
Author: Roland Mas <[email protected]>
Date: Thu May 28 16:50:19 2015 +0200
Strip {CRYPT} as well as {crypt} from passwords fetched from LDAP
diff --git a/src/plugins/authldap/include/AuthLDAPPlugin.class.php
b/src/plugins/authldap/include/AuthLDAPPlugin.class.php
index 01e13cf..04057f7 100644
--- a/src/plugins/authldap/include/AuthLDAPPlugin.class.php
+++ b/src/plugins/authldap/include/AuthLDAPPlugin.class.php
@@ -185,7 +185,8 @@ class AuthLDAPPlugin extends ForgeAuthPlugin {
trim($mapped_data['email']));
$u->setMD5Passwd ($mapped_data['md5_password']);
- if (substr($mapped_data['unix_password'], 0, 7) == '{crypt}') {
+ if ((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']);
-----------------------------------------------------------------------
Summary of changes:
src/plugins/authldap/include/AuthLDAPPlugin.class.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/authldap/include/AuthLDAPPlugin.class.php
b/src/plugins/authldap/include/AuthLDAPPlugin.class.php
index 01e13cf..04057f7 100644
--- a/src/plugins/authldap/include/AuthLDAPPlugin.class.php
+++ b/src/plugins/authldap/include/AuthLDAPPlugin.class.php
@@ -185,7 +185,8 @@ class AuthLDAPPlugin extends ForgeAuthPlugin {
trim($mapped_data['email']));
$u->setMD5Passwd ($mapped_data['md5_password']);
- if (substr($mapped_data['unix_password'], 0, 7) == '{crypt}') {
+ if ((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
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
