Merge pull request #17595 from nextcloud/fix/noid/wrong-pwd-apple-open-dir

blizzz · web-flow · commit a7193ce78133 · 2019-10-21T11:55:51.000+02:00
treat LDAP error 50 as auth issue, prevents lost server connection errors
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
@@ -675,7 +675,8 @@ public function bind() {
 				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;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,8 @@ public function bind() {`
`675`	`675`	`ILogger::WARN);`
`676`	`676`
`677`	`677`	`// Set to failure mode, if LDAP error code is not LDAP_SUCCESS or LDAP_INVALID_CREDENTIALS`
`678`		`- if($errno !== 0x00 && $errno !== 0x31) {`
	`678`	`+ // or (needed for Apple Open Directory:) LDAP_INSUFFICIENT_ACCESS`
	`679`	`+ if($errno !== 0 && $errno !== 49 && $errno !== 50) {`
`679`	`680`	`$this->ldapConnectionRes = null;`
`680`	`681`	`}`
`681`	`682`