[tor-commits] [tor-browser/tor-browser-68.9.0esr-9.5-1] Revert "Bug 1469629 - Read system level policies on Linux if available. r=stransky a=pascalc"

[sysrqb@xxxxxxxxxxxxxx]

commit eb40e93b79f13752b0bc0901986a0c7aabe8cadb
Author: Matthew Finkel <sysrqb@xxxxxxxxxxxxxx>
Date:   Thu May 28 13:44:45 2020 +0000

    Revert "Bug 1469629 - Read system level policies on Linux if available. r=stransky a=pascalc"
    
    This reverts commit c67b847fd43d97bcfe03ac455adbdb283b4872a1.
    
    Bug 34315: avoid reading policies from /etc/firefox on Linux
---
 .../components/enterprisepolicies/EnterprisePolicies.js    | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js
index 5276725703f6..bc0171867dfa 100644
--- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js
+++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js
@@ -480,20 +480,6 @@ class JSONPoliciesProvider {
 
   _getConfigurationFile() {
     let configFile = null;
-
-    if (AppConstants.platform == "linux") {
-      let systemConfigFile = Cc["@mozilla.org/file/local;1"].createInstance(
-        Ci.nsIFile
-      );
-      systemConfigFile.initWithPath(
-        "/etc/" + Services.appinfo.name.toLowerCase() + "/policies"
-      );
-      systemConfigFile.append(POLICIES_FILENAME);
-      if (systemConfigFile.exists()) {
-        return systemConfigFile;
-      }
-    }
-
     try {
       configFile = Services.dirsvc.get("XREAppDist", Ci.nsIFile);
       configFile.append(POLICIES_FILENAME);

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits