Second fix for bug 271473: whitelists addons.mozilla.org not only for new profiles but for existing profiles too, unblocking server-side architectural improvements that are waiting for a version of Firefox which can install extensions from addons.mozilla.org; r=bsmedberg

browser/app/profile/firefox.js

@@ -121,7 +121,8 @@ pref("update.showSlidingNotification", true);   // Windows-only slide-up taskbar
 // 2 = high   (new version of Firefox/Security patch)
 pref("update.severity", 0); 
 
-pref("xpinstall.whitelist.add", "update.mozilla.org,addons.mozilla.org");
+pref("xpinstall.whitelist.add", "update.mozilla.org");
+pref("xpinstall.whitelist.add.103", "addons.mozilla.org");
 
 pref("keyword.enabled", true);
 pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q=");

mail/app/profile/all-thunderbird.js

@@ -106,7 +106,8 @@ pref("update.showSlidingNotification", true);   // Windows-only slide-up taskbar
 // 2 = high   (new version of Firefox/Security patch)
 pref("update.severity", 0); 
 
-pref("xpinstall.whitelist.add", "update.mozilla.org,addons.mozilla.org");
+pref("xpinstall.whitelist.add", "update.mozilla.org");
+pref("xpinstall.whitelist.add.103", "addons.mozilla.org");
 
 pref("mail.phishing.detection.enabled", true); // enable / disable phishing detection for link clicks
 pref("mail.spellcheck.inline", true);

xpinstall/public/nsISoftwareUpdate.h

@@ -57,6 +57,7 @@
 
 #define XPINSTALL_ENABLE_PREF            "xpinstall.enabled"
 #define XPINSTALL_WHITELIST_ADD          "xpinstall.whitelist.add"
+#define XPINSTALL_WHITELIST_ADD_103      "xpinstall.whitelist.add.103"
 #define XPINSTALL_WHITELIST_REQUIRED     "xpinstall.whitelist.required"
 #define XPINSTALL_BLACKLIST_ADD          "xpinstall.blacklist.add"
 

xpinstall/src/nsInstallTrigger.cpp

@@ -349,6 +349,9 @@ nsInstallTrigger::AllowInstall(nsIURI* aLaunchURI)
             updatePermissions( XPINSTALL_WHITELIST_ADD,
                                nsIPermissionManager::ALLOW_ACTION,
                                permissionMgr, prefBranch );
+            updatePermissions( XPINSTALL_WHITELIST_ADD_103,
+                               nsIPermissionManager::ALLOW_ACTION,
+                               permissionMgr, prefBranch );
             updatePermissions( XPINSTALL_BLACKLIST_ADD,
                                nsIPermissionManager::DENY_ACTION,
                                permissionMgr, prefBranch );