From 19cf853e1d7d22bacf2d5b593c9dc0e180ab69e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Thu, 22 Sep 2016 11:12:29 +0200
Subject: [PATCH] Fixes #5004 Optional schema check failure should not block
login
---
html/index.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/html/index.php b/html/index.php
index 670368ffe..9000d3f53 100644
--- a/html/index.php
+++ b/html/index.php
@@ -248,8 +248,12 @@ class Index {
$cfg['tls'] = ($config->get_cfg_value('ldapTLS') == 'TRUE');
$str = check_schema($cfg);
foreach ($str as $tr) {
- if (isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']) {
- return _('LDAP schema check reported errors:').'<br/><br/><i>'.$tr['MSG'].'</i>';
+ if (!$tr['STATUS']) {
+ 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;
--
GitLab