summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:43:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:43:14 +0000
commit8dd16259287f58f9273002717ec4d27e97127719 (patch)
tree3863e62a53829a84037444beab3abd4ed9dfc7d0 /extensions
parentReleasing progress-linux version 126.0.1-1~progress7.99u1. (diff)
downloadfirefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz
firefox-8dd16259287f58f9273002717ec4d27e97127719.zip
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/permissions/test/PermissionTestUtils.sys.mjs14
-rw-r--r--extensions/pref/autoconfig/src/prefcalls.js14
2 files changed, 18 insertions, 10 deletions
diff --git a/extensions/permissions/test/PermissionTestUtils.sys.mjs b/extensions/permissions/test/PermissionTestUtils.sys.mjs
index 84601376ba..84c5f63ecb 100644
--- a/extensions/permissions/test/PermissionTestUtils.sys.mjs
+++ b/extensions/permissions/test/PermissionTestUtils.sys.mjs
@@ -46,6 +46,20 @@ export let PermissionTestUtils = {
return pm.addFromPrincipal(convertToPrincipal(subject), ...args);
},
/**
+ * Add permission information for a given subject.
+ * Subject can be a principal, uri or origin string.
+ *
+ * This is a variant of add that allows specifying modification time.
+ *
+ * @see nsIPermissionManager for documentation
+ *
+ * @param {Ci.nsIPrincipal|Ci.nsIURI|string} subject
+ * @param {*} args
+ */
+ addWithModificationTime(subject, ...args) {
+ return pm.testAddFromPrincipalByTime(convertToPrincipal(subject), ...args);
+ },
+ /**
* Get all custom permissions for a given subject.
* Subject can be a principal, uri or origin string.
*
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);