Commit 19cf853e authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #5004 Optional schema check failure should not block login

Showing with 6 additions and 2 deletions
+6 -2
...@@ -248,8 +248,12 @@ class Index { ...@@ -248,8 +248,12 @@ class Index {
$cfg['tls'] = ($config->get_cfg_value('ldapTLS') == 'TRUE'); $cfg['tls'] = ($config->get_cfg_value('ldapTLS') == 'TRUE');
$str = check_schema($cfg); $str = check_schema($cfg);
foreach ($str as $tr) { foreach ($str as $tr) {
if (isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']) { if (!$tr['STATUS']) {
return _('LDAP schema check reported errors:').'<br/><br/><i>'.$tr['MSG'].'</i>'; if ($tr['IS_MUST_HAVE']) {
return _('LDAP schema check reported errors:').'<br/><br/><i>'.$tr['MSG'].'</i>';
} else {
msg_dialog::display(_('LDAP schema error'), $tr['MSG'], WARNING_DIALOG);
}
} }
} }
return TRUE; return TRUE;
......
  • bmortier @bmortier

    mentioned in issue #1588

    By coudot on 2017-09-02T15:31:43 (imported from GitLab)

    ·

    mentioned in issue #1588

    By coudot on 2017-09-02T15:31:43 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment