commit e95c515352094f6c3d943a3313628c370feb18f2 Author: Georg Koppen gk@torproject.org Date: Mon Apr 1 13:51:43 2019 +0000

Revert "Bug 29445: Enable support for enterprise policies"

This reverts commit 00a7fc743aebc68f59df743236c2165274cbc608. --- browser/components/enterprisepolicies/EnterprisePolicies.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js index 1380c0c228a4..7c864f5fbc43 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(`Enterprise policy ${policyName} is not allowed`); + log.error(`Policy ${policyName} is only allowed on ESR`); continue; }

@@ -314,6 +314,10 @@ 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() { @@ -324,7 +328,12 @@ function areEnterpriseOnlyPoliciesAllowed() { return false; }

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

/*