Commit eb40e93b authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Revert "Bug 1469629 - Read system level policies on Linux if available. r=stransky a=pascalc" 

This reverts commit c67b847f.

Bug 34315: avoid reading policies from /etc/firefox on Linux
parent bce6091b

toolkit/components/enterprisepolicies/EnterprisePolicies.js

+0 −14
Original line number Diff line number Diff line
@@ -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);