commit 7ce43156780e3b91f35481cce1eb4afed56a4b0f Author: Kathy Brade brade@pearlcrescent.com Date: Tue Mar 5 13:58:52 2019 -0500

Bug 29445: Enable support for enterprise policies

Enable enterprise policies for all update channels, including "release" (which Tor Browser uses instead of "esr"). --- browser/components/enterprisepolicies/EnterprisePolicies.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js index 7c864f5fbc43..1380c0c228a4 100644 --- a/browser/components/enterprisepolicies/EnterprisePolicies.js +++ b/browser/components/enterprisepolicies/EnterprisePolicies.js @@ -126,7 +126,7 @@ EnterprisePoliciesManager.prototype = { }

if (policySchema.enterprise_only && !areEnterpriseOnlyPoliciesAllowed()) { - log.error(`Policy ${policyName} is only allowed on ESR`); + log.error(`Enterprise policy ${policyName} is not allowed`); continue; }

@@ -314,10 +314,6 @@ let DisallowedFeatures = {}; * Checks whether the policies marked as enterprise_only in the * schema are allowed to run on this browser. * - * This is meant to only allow policies to run on ESR, but in practice - * we allow it to run on channels different than release, to allow - * these policies to be tested on pre-release channels. - * * @returns {Bool} Whether the policy can run. */ function areEnterpriseOnlyPoliciesAllowed() { @@ -328,12 +324,7 @@ function areEnterpriseOnlyPoliciesAllowed() { return false; }

- if (AppConstants.MOZ_UPDATE_CHANNEL != "release" || - Cu.isInAutomation) { - return true; - } - - return false; + return true; }

/*