diff options
| author | Brion Vibber <brion@pobox.com> | 2010-12-17 17:13:21 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-12-17 17:13:21 -0800 |
| commit | d8a3a88ec8eae3134694c98e5a9ae42bc30b289f (patch) | |
| tree | 22554406da875404d3417edd91eaeaeef0bb693c /plugins/LdapCommon | |
| parent | bf59eaf602c8319d5ae99d9809b4d4867cb632cd (diff) | |
| parent | fb8312ebf4537033077917d0003f716206d0d23d (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
classes/Memcached_DataObject.php
Diffstat (limited to 'plugins/LdapCommon')
| -rw-r--r-- | plugins/LdapCommon/LdapCommon.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php index 579fe4b64..3afcd824f 100644 --- a/plugins/LdapCommon/LdapCommon.php +++ b/plugins/LdapCommon/LdapCommon.php @@ -140,7 +140,7 @@ class LdapCommon function checkPassword($username, $password) { - $entry = $this->get_user($username); + $entry = $this->get_user($username,array('dn' => 'dn')); if(!$entry){ return false; }else{ @@ -168,7 +168,7 @@ class LdapCommon //throw new Exception(_('Sorry, changing LDAP passwords is not supported at this time')); return false; } - $entry = $this->get_user($username); + $entry = $this->get_user($username,array('dn' => 'dn')); if(!$entry){ return false; }else{ |