jenkins-bot has submitted this change and it was merged.
Change subject: AIn connect(), avoid ldap_connect() in case of empty servers
list
......................................................................
AIn connect(), avoid ldap_connect() in case of empty servers list
Otherwise, undesired warning are produced within the generated page.
Change-Id: Id473aa09ab60e053dff3500e63e7dc66c80e3ab7
---
M LdapAuthentication.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/LdapAuthentication.php b/LdapAuthentication.php
index 362ffee..e124b71 100644
--- a/LdapAuthentication.php
+++ b/LdapAuthentication.php
@@ -591,6 +591,10 @@
$tok = strtok( " " );
}
$servers = trim( $servers );
+ if ( !$servers ) {
+ $this->printDebug( 'Empty server string, skipping
connection', NONSENSITIVE );
+ return false;
+ }
$this->printDebug( "Using servers: $servers", SENSITIVE );
--
To view, visit https://gerrit.wikimedia.org/r/135024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id473aa09ab60e053dff3500e63e7dc66c80e3ab7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/LdapAuthentication
Gerrit-Branch: master
Gerrit-Owner: Bugsbunny <[email protected]>
Gerrit-Reviewer: Bugsbunny <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Qgil <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
