From: Michael Kaply <consulting@kaply.com>
Date: Mon, 19 Mar 2018 21:10:48 +0000 (-0500)
Subject: Merge pull request #25 from mozilla/1440573_DisableSafeMode
X-Git-Tag: 0.9~37
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/55f545f9063af896578b9798d5b555be24d766db?hp=905cf3997e69f8e82ce7d5a407c681458358e2c1

Merge pull request #25 from mozilla/1440573_DisableSafeMode

Policy for Disable Safe Mode. Fixes #18
---

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 2e716d0..06beb4b 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -47,6 +47,8 @@
       <string id="DisablePocket_Explain">Prevents ability to save webpages to Pocket.</string>
       <string id="DisablePrivateBrowsing">Disable Private Browsing</string>
       <string id="DisablePrivateBrowsing_Explain">Disables private browsing.</string>
+      <string id="DisableSafeMode">Disable Safe Mode</string>
+      <string id="DisableSafeMode_Explain">Prevents ability to restart in safe mode.</string>
       <string id="DisableSysAddonUpdate">Disable System Addon Updates</string>
       <string id="DisableSysAddonUpdate_Explain">Prevent the browser from installing and updating system addons.</string>
       <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index c97352b..842ada1 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -188,6 +188,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="DisableSafeMode" class="Both" displayName="$(string.DisableSafeMode)" explainText="$(string.DisableSafeMode_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableSafeMode">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="DisableSysAddonUpdate" class="Both" displayName="$(string.DisableSysAddonUpdate)" explainText="$(string.DisableSysAddonUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableSysAddonUpdate">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>