Stop throwing an exception, when a domain is not available during search. It gets skipped now.

robin.kluth · robin.kluth · commit 68d2ac45f2b9 · 2021-07-12T09:51:18.000+02:00
diff --git a/src/LdapAuth.php b/src/LdapAuth.php
@@ -355,10 +355,11 @@ public function searchUser($searchFor, $attributes = "", $searchFilter = "", $do
             Yii::debug($domain, __METHOD__);
             if (!$this->login($domain['publicSearchUser'], $domain['publicSearchUserPassword'], $i)) {
                 if (empty($this->_l)) {
-                    throw new ErrorException('LDAP Connect or Bind error on ' . $domain['hostname']);
+                    Yii::error('LDAP Connect or Bind error on ' . $domain['hostname'] . ', skipping...', __METHOD__);
                 } else {
-                    throw new ErrorException('LDAP Connect or Bind error (' . ldap_errno($this->_l) . ' - ' . ldap_error($this->_l) . ') on ' . $domain['hostname']);
+                    Yii::error('LDAP Connect or Bind error (' . ldap_errno($this->_l) . ' - ' . ldap_error($this->_l) . ') on ' . $domain['hostname'] . ', skipping...');
                 }
+                continue; // Skip the whole domain
             }
 
             $searchFilter = str_replace("%searchFor%", addslashes($searchFor), $searchFilter);

Original file line number	Diff line number	Diff line change
`@@ -355,10 +355,11 @@ public function searchUser($searchFor, $attributes = "", $searchFilter = "", $do`
`355`	`355`	`Yii::debug($domain, __METHOD__);`
`356`	`356`	`if (!$this->login($domain['publicSearchUser'], $domain['publicSearchUserPassword'], $i)) {`
`357`	`357`	`if (empty($this->_l)) {`
`358`		`- throw new ErrorException('LDAP Connect or Bind error on ' . $domain['hostname']);`
	`358`	`+ Yii::error('LDAP Connect or Bind error on ' . $domain['hostname'] . ', skipping...', __METHOD__);`
`359`	`359`	`} else {`
`360`		`- throw new ErrorException('LDAP Connect or Bind error (' . ldap_errno($this->_l) . ' - ' . ldap_error($this->_l) . ') on ' . $domain['hostname']);`
	`360`	`+ Yii::error('LDAP Connect or Bind error (' . ldap_errno($this->_l) . ' - ' . ldap_error($this->_l) . ') on ' . $domain['hostname'] . ', skipping...');`
`361`	`361`	`}`
	`362`	`+ continue; // Skip the whole domain`
`362`	`363`	`}`
`363`	`364`
`364`	`365`	`$searchFilter = str_replace("%searchFor%", addslashes($searchFor), $searchFilter);`