Fix for when method supplies null for login details

This commit is contained in:
Deon George 2009-07-27 19:17:40 +10:00
parent 86c8f13065
commit fb48055d2d

View File

@ -144,6 +144,9 @@ class ldap extends DS {
$bind['id'] = is_null($this->getLogin($method)) && $method != 'anon' ? $this->getLogin('user') : $this->getLogin($method); $bind['id'] = is_null($this->getLogin($method)) && $method != 'anon' ? $this->getLogin('user') : $this->getLogin($method);
$bind['pass'] = is_null($this->getPassword($method)) && $method != 'anon' ? $this->getPassword('user') : $this->getPassword($method); $bind['pass'] = is_null($this->getPassword($method)) && $method != 'anon' ? $this->getPassword('user') : $this->getPassword($method);
if ($method == 'anon' && $bind['id'])
debug_dump_backtrace('Anon should not have an id',1);
# If our bind id is still null, we are not logged in. # If our bind id is still null, we are not logged in.
if (is_null($bind['id']) && $method != 'anon') if (is_null($bind['id']) && $method != 'anon')
return null; return null;
@ -273,9 +276,15 @@ class ldap extends DS {
} }
} else { } else {
if ($method == 'user') {
$method = 'anon'; $method = 'anon';
$userDN = ''; $userDN = '';
$pass = ''; $pass = '';
} else {
$userDN = $this->getLogin('user');
$pass = $this->getLogin('user');
}
} }
if (! $this->isAnonBindAllowed() && ! trim($userDN)) if (! $this->isAnonBindAllowed() && ! trim($userDN))