summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2019-10-21 11:55:51 +0200
committerGitHub <noreply@github.com>2019-10-21 11:55:51 +0200
commita7193ce781330c8050bafb8d4fc873846c6a8b9b (patch)
treeb969dee919ae95156ffcd2a975be0643579b13a7 /apps/user_ldap
parent75ecae28e6dae37e6e80ce493f28b162dfa7c4d1 (diff)
parent38a8306e32237b6a51541a58ea21ac477ab5503e (diff)
downloadnextcloud-server-a7193ce781330c8050bafb8d4fc873846c6a8b9b.tar.gz
nextcloud-server-a7193ce781330c8050bafb8d4fc873846c6a8b9b.zip
Merge pull request #17595 from nextcloud/fix/noid/wrong-pwd-apple-open-dir
treat LDAP error 50 as auth issue, prevents lost server connection errors
Diffstat (limited to 'apps/user_ldap')
-rw-r--r--apps/user_ldap/lib/Connection.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
index 35770f082fa..db4362a9eb2 100644
--- a/apps/user_ldap/lib/Connection.php
+++ b/apps/user_ldap/lib/Connection.php
@@ -675,7 +675,8 @@ class Connection extends LDAPUtility {
ILogger::WARN);
// Set to failure mode, if LDAP error code is not LDAP_SUCCESS or LDAP_INVALID_CREDENTIALS
- if($errno !== 0x00 && $errno !== 0x31) {
+ // or (needed for Apple Open Directory:) LDAP_INSUFFICIENT_ACCESS
+ if($errno !== 0 && $errno !== 49 && $errno !== 50) {
$this->ldapConnectionRes = null;
}