From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- extensions/pref/autoconfig/src/prefcalls.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'extensions/pref') diff --git a/extensions/pref/autoconfig/src/prefcalls.js b/extensions/pref/autoconfig/src/prefcalls.js index b66e5df898..fcd0554e95 100644 --- a/extensions/pref/autoconfig/src/prefcalls.js +++ b/extensions/pref/autoconfig/src/prefcalls.js @@ -8,7 +8,6 @@ const LDAPSyncQueryContractID = "@mozilla.org/ldapsyncquery;1"; -var gVersion; var gIsUTF8; function getPrefBranch() { @@ -111,8 +110,8 @@ function clearPref(prefName) { } catch (e) {} } -function setLDAPVersion(version) { - gVersion = version; +function setLDAPVersion(_version) { + // No longer implemented, but still here to avoid breaking anything. } function getLDAPAttributes(host, base, filter, attribs, isSecure) { @@ -138,16 +137,11 @@ function getLDAPAttributes(host, base, filter, attribs, isSecure) { // eslint-disable-next-line mozilla/valid-ci-uses Ci.nsILDAPSyncQuery ); - // default to LDAP v3 - if (!gVersion) { - // eslint-disable-next-line mozilla/valid-ci-uses - gVersion = Ci.nsILDAPConnection.VERSION3; - } // user supplied method if ("processLDAPValues" in gSandbox) { - gSandbox.processLDAPValues(ldapquery.getQueryResults(url, gVersion)); + gSandbox.processLDAPValues(ldapquery.getQueryResults(url)); } else { - processLDAPValues(ldapquery.getQueryResults(url, gVersion)); + processLDAPValues(ldapquery.getQueryResults(url)); } } catch (e) { displayError("getLDAPAttributes", e); -- cgit v1.2.3