Fixing #5590 - LDAP Server issues

Secondary LDAP server not evaluated when the first one has failed
Cacti · Nov 23, 2023 · 59cf144 · 59cf144
1 parent 5059751
commit 59cf144
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -124,6 +124,7 @@ Cacti CHANGELOG
 -issue#5585: Refix Issue #4649 using more appropriate method
 -issue#5586: CSV export displays data shifted by rrd step interval
 -issue#5589: When a graph has a real long cdef in graph debug mode, it forces an undesirable scroll
+-issue#5590: Secondary LDAP server not evaluated when the first one has failed
 -feature#5577: Provide new templates for ArubaOS switch, Aruba wifi controller and HPE iLO to be available during install
 
 1.2.25

diff --git a/lib/ldap.php b/lib/ldap.php
@@ -727,7 +727,9 @@ function Connect() {
 			if ($this->referrals == '0') {
 				if (!ldap_set_option($ldap_conn, LDAP_OPT_REFERRALS, 0)) {
 					$output = LdapError::GetErrorDetails(LdapError::ProtocolErrorReferral, $ldap_conn, $this->host);
+
 					Ldap::RecordError($output);
+
 					ldap_close($ldap_conn);
 
 					return array(
@@ -741,7 +743,9 @@ function Connect() {
 			if ($this->encryption == '2') {
 				if (!ldap_start_tls($ldap_conn)) {
 					$output = LdapError::GetErrorDetails(LdapError::ProtocolErrorTls, $ldap_conn, $this->host);
+
 					Ldap::RecordError($output);
+
 					ldap_close($ldap_conn);
 
 					return array(
@@ -750,9 +754,17 @@ function Connect() {
 					);
 				}
 			}
-		}
 
-		return array('ldap_conn' => $ldap_conn, 'output' => $output);
+			return array('ldap_conn' => $ldap_conn, 'output' => $output);
+		} else {
+			$output = LdapError::GetErrorDetails(LdapError::ConnectionUnavailable, $ldap_conn, $this->host);
+			Ldap::RecordError($output);
+
+			return array(
+				'ldap_conn' => $ldap_conn,
+				'output'    => $output
+			);
+		}
 	}
 
 	function Authenticate() {