fixup! Bug 40253: Explicitly allow NoScript in Private Browsing mode.

Bug 41598: Prevent NoScript from being removed/disabled.
Bug 40253: Explicitly allow NoScript in Private Browsing mode.

toolkit/mozapps/extensions/internal/XPIDatabase.jsm

@@ -854,6 +854,15 @@ class AddonInternal {
       }
     }
 
+    // Bug 41598: prevent NoScript from being uninstalled/disabled
+    if (this.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}") {
+      permissions &= ~(
+        AddonManager.PERM_CAN_UNINSTALL |
+        AddonManager.PERM_CAN_DISABLE |
+        AddonManager.PERM_CAN_CHANGE_PRIVATEBROWSING_ACCESS
+      );
+    }
+
     return permissions;
   }