96352c5
diff -up firefox-75.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-75.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
96352c5
--- firefox-75.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2020-04-03 21:34:41.000000000 +0200
96352c5
+++ firefox-75.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2020-04-06 22:40:02.760674871 +0200
96352c5
@@ -244,8 +244,20 @@ nsresult nsReadConfig::openAndEvaluateJS
eec2ffa
     if (NS_FAILED(rv)) return rv;
Martin Stransky 4bed479
 
eec2ffa
     rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
eec2ffa
-    if (NS_FAILED(rv)) return rv;
eec2ffa
+    if (NS_FAILED(rv)) {
eec2ffa
+      // Look for cfg file in /etc/<application>/pref
eec2ffa
+      rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
eec2ffa
+                                  getter_AddRefs(jsFile));
eec2ffa
+      NS_ENSURE_SUCCESS(rv, rv);
Martin Stransky 4bed479
+
dced7c2
+      rv = jsFile->AppendNative(nsLiteralCString("pref"));
eec2ffa
+      NS_ENSURE_SUCCESS(rv, rv);
eec2ffa
+      rv = jsFile->AppendNative(nsDependentCString(aFileName));
eec2ffa
+      NS_ENSURE_SUCCESS(rv, rv);
8c8f061
 
eec2ffa
+      rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
eec2ffa
+      NS_ENSURE_SUCCESS(rv, rv);
eec2ffa
+    }
eec2ffa
   } else {
eec2ffa
     nsAutoCString location("resource://gre/defaults/autoconfig/");
eec2ffa
     location += aFileName;
96352c5
diff -up firefox-75.0/modules/libpref/Preferences.cpp.1170092 firefox-75.0/modules/libpref/Preferences.cpp
96352c5
--- firefox-75.0/modules/libpref/Preferences.cpp.1170092	2020-04-06 22:40:02.761674865 +0200
96352c5
+++ firefox-75.0/modules/libpref/Preferences.cpp	2020-04-06 22:40:57.675325227 +0200
96352c5
@@ -4468,6 +4468,9 @@ nsresult Preferences::InitInitialObjects
5d35b83
   //
5d35b83
   // Thus, in the omni.jar case, we always load app-specific default
5d35b83
   // preferences from omni.jar, whether or not `$app == $gre`.
bbb92a8
+  //
Martin Stransky 4bed479
+  // At very end load configuration from system config location:
Martin Stransky 4bed479
+  // - /etc/firefox/pref/*.js
Martin Stransky 4bed479
 
bbb92a8
   nsresult rv = NS_ERROR_FAILURE;
96352c5
   UniquePtr<nsZipFind> find;
96352c5
diff -up firefox-75.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-75.0/toolkit/xre/nsXREDirProvider.cpp
96352c5
--- firefox-75.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2020-04-03 21:35:39.000000000 +0200
96352c5
+++ firefox-75.0/toolkit/xre/nsXREDirProvider.cpp	2020-04-06 22:40:02.761674865 +0200
96352c5
@@ -60,6 +60,7 @@
Martin Stransky 4bed479
 #endif
Martin Stransky 4bed479
 #ifdef XP_UNIX
83e8010
 #  include <ctype.h>
83e8010
+#  include "nsIXULAppInfo.h"
Martin Stransky 4bed479
 #endif
b33c1cc
 #ifdef XP_IOS
83e8010
 #  include "UIKitDirProvider.h"
96352c5
@@ -533,6 +534,21 @@ nsXREDirProvider::GetFile(const char* aP
Martin Stransky 4bed479
       }
Martin Stransky 4bed479
     }
Martin Stransky 4bed479
   }
eec2ffa
+
Martin Stransky 4bed479
+#if defined(XP_UNIX)
Martin Stransky 4bed479
+  if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
dced7c2
+    nsCString sysConfigDir = nsLiteralCString("/etc/");
Martin Stransky 4bed479
+    nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
Martin Stransky 4bed479
+    if (!appInfo)
Martin Stransky 4bed479
+      return NS_ERROR_NOT_AVAILABLE;
Martin Stransky 4bed479
+    nsCString appName;
Martin Stransky 4bed479
+    appInfo->GetName(appName);
Martin Stransky 4bed479
+    ToLowerCase(appName);
Martin Stransky 4bed479
+    sysConfigDir.Append(appName);
Martin Stransky 4bed479
+    return NS_NewNativeLocalFile(sysConfigDir, false, aFile);
Martin Stransky 4bed479
+  }
Martin Stransky 4bed479
+#endif
Martin Stransky 4bed479
+
eec2ffa
   if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
Martin Stransky 4bed479
 
eec2ffa
   if (ensureFilePermissions) {
96352c5
@@ -845,6 +861,16 @@ nsresult nsXREDirProvider::GetFilesInter
41edb62
 
eec2ffa
     LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
fdd5163
 
Martin Stransky 4bed479
+    // Add /etc/<application>/pref/ directory if it exists
Martin Stransky 4bed479
+    nsCOMPtr<nsIFile> systemPrefDir;
eec2ffa
+    rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
eec2ffa
+                                getter_AddRefs(systemPrefDir));
Martin Stransky 4bed479
+    if (NS_SUCCEEDED(rv)) {
dced7c2
+      rv = systemPrefDir->AppendNative(nsLiteralCString("pref"));
Martin Stransky 4bed479
+      if (NS_SUCCEEDED(rv))
eec2ffa
+        directories.AppendObject(systemPrefDir);
Martin Stransky 4bed479
+    }
fdd5163
+
fdd5163
     rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
eec2ffa
   } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
eec2ffa
     // NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
96352c5
diff -up firefox-75.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-75.0/xpcom/io/nsAppDirectoryServiceDefs.h
96352c5
--- firefox-75.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2020-04-03 21:35:39.000000000 +0200
96352c5
+++ firefox-75.0/xpcom/io/nsAppDirectoryServiceDefs.h	2020-04-06 22:40:02.761674865 +0200
41edb62
@@ -60,6 +60,7 @@
eec2ffa
 #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
eec2ffa
 #define NS_APP_PREFS_OVERRIDE_DIR \
eec2ffa
   "PrefDOverride"  // Directory for per-profile defaults
Martin Stransky 4bed479
+#define NS_APP_PREFS_SYSTEM_CONFIG_DIR          "PrefSysConf"   // Directory with system-wide configuration
Martin Stransky 4bed479
 
eec2ffa
 #define NS_APP_USER_PROFILE_50_DIR "ProfD"
eec2ffa
 #define NS_APP_USER_PROFILE_LOCAL_50_DIR "ProfLD"