2559ee
diff -up firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
2559ee
--- firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2021-07-27 23:29:57.000000000 +0200
2559ee
+++ firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2021-07-29 16:20:44.164513998 +0200
2559ee
@@ -249,8 +249,20 @@ nsresult nsReadConfig::openAndEvaluateJS
0fe52e
     if (NS_FAILED(rv)) return rv;
a8a561
 
0fe52e
     rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
0fe52e
-    if (NS_FAILED(rv)) return rv;
0fe52e
+    if (NS_FAILED(rv)) {
0fe52e
+      // Look for cfg file in /etc/<application>/pref
0fe52e
+      rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
0fe52e
+                                  getter_AddRefs(jsFile));
0fe52e
+      NS_ENSURE_SUCCESS(rv, rv);
a8a561
+
2559ee
+      rv = jsFile->AppendNative(nsLiteralCString("pref"));
0fe52e
+      NS_ENSURE_SUCCESS(rv, rv);
0fe52e
+      rv = jsFile->AppendNative(nsDependentCString(aFileName));
0fe52e
+      NS_ENSURE_SUCCESS(rv, rv);
ae11a9
 
0fe52e
+      rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
0fe52e
+      NS_ENSURE_SUCCESS(rv, rv);
0fe52e
+    }
0fe52e
   } else {
0fe52e
     nsAutoCString location("resource://gre/defaults/autoconfig/");
0fe52e
     location += aFileName;
2559ee
diff -up firefox-91.0/modules/libpref/Preferences.cpp.1170092 firefox-91.0/modules/libpref/Preferences.cpp
2559ee
--- firefox-91.0/modules/libpref/Preferences.cpp.1170092	2021-07-27 23:30:34.000000000 +0200
2559ee
+++ firefox-91.0/modules/libpref/Preferences.cpp	2021-07-29 16:20:44.166514005 +0200
2559ee
@@ -4553,6 +4553,8 @@ nsresult Preferences::InitInitialObjects
ae11a9
   //
ae11a9
   // Thus, in the omni.jar case, we always load app-specific default
ae11a9
   // preferences from omni.jar, whether or not `$app == $gre`.
a8a561
+  // At very end load configuration from system config location:
a8a561
+  // - /etc/firefox/pref/*.js
a8a561
 
ea29f4
   nsresult rv = NS_ERROR_FAILURE;
83ba88
   UniquePtr<nsZipFind> find;
2559ee
diff -up firefox-91.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-91.0/toolkit/xre/nsXREDirProvider.cpp
2559ee
--- firefox-91.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2021-07-27 23:30:56.000000000 +0200
2559ee
+++ firefox-91.0/toolkit/xre/nsXREDirProvider.cpp	2021-07-29 16:26:20.071628932 +0200
2559ee
@@ -71,6 +71,7 @@
4f0c3e
 #endif
4f0c3e
 #ifdef XP_UNIX
4f0c3e
 #  include <ctype.h>
4f0c3e
+#  include "nsIXULAppInfo.h"
4f0c3e
 #endif
4f0c3e
 #ifdef XP_IOS
4f0c3e
 #  include "UIKitDirProvider.h"
2559ee
@@ -550,6 +551,21 @@ nsXREDirProvider::GetFile(const char* aP
a8a561
       }
a8a561
     }
a8a561
   }
0fe52e
+
a8a561
+#if defined(XP_UNIX)
a8a561
+  if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
2559ee
+    nsCString sysConfigDir = nsLiteralCString("/etc/");
a8a561
+    nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
a8a561
+    if (!appInfo)
a8a561
+      return NS_ERROR_NOT_AVAILABLE;
a8a561
+    nsCString appName;
a8a561
+    appInfo->GetName(appName);
a8a561
+    ToLowerCase(appName);
a8a561
+    sysConfigDir.Append(appName);
a8a561
+    return NS_NewNativeLocalFile(sysConfigDir, false, aFile);
a8a561
+  }
a8a561
+#endif
a8a561
+
0fe52e
   if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
a8a561
 
0fe52e
   if (ensureFilePermissions) {
2559ee
@@ -827,6 +843,16 @@ nsresult nsXREDirProvider::GetFilesInter
2559ee
       LoadDirIntoArray(mXULAppDir, kAppendBackgroundTasksPrefDir, directories);
2559ee
     }
2559ee
 #endif
a8a561
+    // Add /etc/<application>/pref/ directory if it exists
a8a561
+    nsCOMPtr<nsIFile> systemPrefDir;
0fe52e
+    rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
0fe52e
+                                getter_AddRefs(systemPrefDir));
a8a561
+    if (NS_SUCCEEDED(rv)) {
2559ee
+      rv = systemPrefDir->AppendNative(nsLiteralCString("pref"));
83ba88
+      if (NS_SUCCEEDED(rv)) {
a8a561
+        directories.AppendObject(systemPrefDir);
83ba88
+      }
a8a561
+    }
2559ee
 
ea29f4
     rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
0fe52e
   } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
2559ee
diff -up firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h
2559ee
--- firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2021-07-27 23:31:38.000000000 +0200
2559ee
+++ firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h	2021-07-29 16:20:44.168514012 +0200
2559ee
@@ -59,6 +59,7 @@
0fe52e
 #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
0fe52e
 #define NS_APP_PREFS_OVERRIDE_DIR \
0fe52e
   "PrefDOverride"  // Directory for per-profile defaults
a8a561
+#define NS_APP_PREFS_SYSTEM_CONFIG_DIR          "PrefSysConf"   // Directory with system-wide configuration
a8a561
 
0fe52e
 #define NS_APP_USER_PROFILE_50_DIR "ProfD"
0fe52e
 #define NS_APP_USER_PROFILE_LOCAL_50_DIR "ProfLD"