From ce0ec472f1652ece255f333a450b2674fce80a68 Mon Sep 17 00:00:00 2001
From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Wed, 1 Jul 2020 10:17:13 -0500
Subject: [PATCH] MasterPassword should be in 79.

---
 mac/org.mozilla.firefox.plist | 2 --
 windows/de-DE/firefox.adml    | 2 +-
 windows/en-US/firefox.adml    | 2 +-
 windows/es-ES/firefox.adml    | 2 +-
 windows/firefox.admx          | 8 ++++----
 windows/fr-FR/firefox.adml    | 2 +-
 windows/it-IT/firefox.adml    | 2 +-
 windows/zh-TW/firefox.adml    | 2 +-
 8 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index e0043ed..7bc00f5 100644
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -374,8 +374,6 @@
 		<string>http://example.org</string>
 		<string>http://example.edu</string>
 	</array>
-	<key>MasterPassword</key>
-	<true/>
 	<key>NetworkPrediction</key>
 	<false/>
 	<key>NewTabPage</key>
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 637cbf4..888b52b 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 599e8ef..d14e130 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 765368c..08d2f54 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 86964ab..5a3785b 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="2.0" schemaVersion="1.0">
+<policyDefinitions revision="2.01" schemaVersion="1.0">
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
-  <resources minRequiredRevision="2.0"/>
+  <resources minRequiredRevision="2.01"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>
@@ -3617,7 +3617,7 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="MasterPassword" class="Both" displayName="$(string.MasterPassword)" explainText="$(string.MasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="MasterPassword">
+<!--    <policy name="MasterPassword" class="Both" displayName="$(string.MasterPassword)" explainText="$(string.MasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="MasterPassword">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>
       <enabledValue>
@@ -3626,7 +3626,7 @@
       <disabledValue>
         <decimal value="0"/>
       </disabledValue>
-    </policy>
+    </policy> -->
     <policy name="Handlers" class="Both" displayName="$(string.Handlers)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)"  presentation="$(presentation.Handlers)">">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 26c8c26..3e08766 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 25dedc1..0249ee0 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 107e86e..d1250ea 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
-- 
2.34.1