diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-04-18 19:21:15 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-04-18 19:21:15 -0400 |
commit | 39392e03a71d94d6b984033b994b417edfc2d8d6 (patch) | |
tree | cb3ae36fc9a20a4cd884e271ef36dcce28f109c8 /plugins/LdapAuthentication | |
parent | 727ea5a5163249eb40fa0c4b2c63054fc997473b (diff) | |
parent | 23bad16bba52a09f0cea3d2c40e6cf91e2945e37 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/imsettings.php
Diffstat (limited to 'plugins/LdapAuthentication')
-rw-r--r-- | plugins/LdapAuthentication/LdapAuthenticationPlugin.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index 2e01738ec..0dfc4c63b 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -96,7 +96,12 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin if($entry){ $registration_data = array(); foreach($this->attributes as $sn_attribute=>$ldap_attribute){ - $registration_data[$sn_attribute]=$entry->getValue($ldap_attribute,'single'); + //ldap won't let us read a user's password, + //and we're going to set the password to a random string later anyways, + //so don't bother trying to read it. + if($sn_attribute != 'password'){ + $registration_data[$sn_attribute]=$entry->getValue($ldap_attribute,'single'); + } } if(isset($registration_data['email']) && !empty($registration_data['email'])){ $registration_data['email_confirmed']=true; |