SF Bug #2828378 - fallback_dn config option no longer works in 1.2.0
This commit is contained in:
parent
9cb27e3a70
commit
c69cd68fcb
@ -258,6 +258,9 @@ class ldap extends DS {
|
|||||||
else
|
else
|
||||||
$userDN = $this->getLoginID($user,'login');
|
$userDN = $this->getLoginID($user,'login');
|
||||||
|
|
||||||
|
if (! $userDN && $this->getValue('login','fallback_dn'))
|
||||||
|
$userDN = $user;
|
||||||
|
|
||||||
if (! $userDN)
|
if (! $userDN)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -27,6 +27,10 @@ class ldap_pla extends ldap {
|
|||||||
'desc'=>'Whether to show the "Create new Entry here" in the tree browser',
|
'desc'=>'Whether to show the "Create new Entry here" in the tree browser',
|
||||||
'default'=>true);
|
'default'=>true);
|
||||||
|
|
||||||
|
$this->default->login['fallback_dn'] = array(
|
||||||
|
'desc'=>'If the attribute base login fails, see if a DN was entered',
|
||||||
|
'default'=>false);
|
||||||
|
|
||||||
$this->default->query['disable_default'] = array(
|
$this->default->query['disable_default'] = array(
|
||||||
'desc'=>'Configuration to disable the default query template',
|
'desc'=>'Configuration to disable the default query template',
|
||||||
'default'=>false);
|
'default'=>false);
|
||||||
|
Loading…
Reference in New Issue
Block a user