From: Michael Kaply <consulting@kaply.com>
Date: Wed, 27 Jun 2018 17:12:26 +0000 (-0500)
Subject: Add support for non FQDN policy - Bugzilla 1471651
X-Git-Tag: v1.2~20^2~1
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/51e11dc5a69e28486b8aa41006bce60a9d012c4b?hp=--cc

Add support for non FQDN policy - Bugzilla 1471651
---

51e11dc5a69e28486b8aa41006bce60a9d012c4b
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 3b3ac8d..a78edb3 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -5,7 +5,8 @@
   <resources >
     <stringTable >
       <string id="SUPPORTED_WINXPSP2">Microsoft Windows XP SP2 or later</string>
-      <string id="SUPPORTED_FF60">Firefox 60 or later</string>
+      <string id="SUPPORTED_FF60">Firefox 60 or later, Firefox 60 ESR or later</string>
+      <string id="SUPPORTED_FF62">Firefox 62 or later, Firefox 60.2 ESR or later</string>
       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
@@ -24,7 +25,7 @@
       <string id="Authentication_SPNEGO">SPNEGO</string>
       <string id="Authentication_SPNEGO_Explain">If this policy is enabled, the specified websites are permitted to engage in SPNEGO authentication with the browser. Entries in the list are formatted as mydomain.com or https://myotherdomain.com.
 
-If this policy is disabled or not configured, No websites are permitted to engage in SPNEGO authentication with the browser.
+If this policy is disabled or not configured, no websites are permitted to engage in SPNEGO authentication with the browser.
 
 For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication.</string>
       <string id="Authentication_Delegated">Delegated</string>
@@ -36,9 +37,13 @@ For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Integ
       <string id="Authentication_NTLM">NTLM</string>
       <string id="Authentication_NTLM_Explain">If this policy is enabled, the specified websites are trusted to use NTLM authentification. Entries in the list are formatted as mydomain.com or https://myotherdomain.com.
 
-If this policy is disabled or not configured, No websites are trusted to use NTLM authentification.
+If this policy is disabled or not configured, no websites are trusted to use NTLM authentification.
 
 For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication.</string>
+      <string id="Authentication_AllowNonFQDN">Allow Non FQDN</string>
+      <string id="Authentication_AllowNonFQDN_Explain">If this policy is enabled, you can always allow SPNEGO or NTLM on non FQDNs (fully qualified domain names).
+
+If this policy is disabled or not configured, NTLM and SPNEGO are not enabled on non FQDNs.</string>
       <string id="BlockAboutAddons">Block Add-ons Manager</string>
       <string id="BlockAboutAddons_Explain" >If this policy is enabled, the user can not access the Add-ons Manager or about:addons.
 
@@ -63,12 +68,13 @@ If this policy is disabled or not configured, users can set images as their desk
       <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
 
 If this policy is disabled or not configured, Firefox will not read certificates from the Windows certificate store.</string>
+
       <string id="DisableMasterPasswordCreation">Disable Master Password Creation</string>
       <string id="DisableMasterPasswordCreation_Explain">If this policy is enabled, users cannot create a master password.
 
 If this policy is disabled or not configured, users can create a master password.</string>
       <string id="DisableAppUpdate">Disable Update</string>
-      <string id="DisableAppUpdate_Explain">If this policy is enabled, the browser does not receive updates.
+      <string id="DisableAppUpdate_Explain">If this policy is enabled, the browser does not receive udpates.
 
 If this policy is disabled or not configured, the browser receives updates.</string>
       <string id="DisableBuiltinPDFViewer">Disable Built-in PDF Viewer (PDF.js)</string>
@@ -329,6 +335,10 @@ If this policy is not configured or disabled, search engines can be installed fr
       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>
+      <presentation id="Authentication_AllowNonFQDN">
+        <checkBox refId="Authentication_AllowNonFQDN_NTLM">Always allow NTLM on non FQDNs</checkBox>
+        <checkBox refId="Authentication_AllowNonFQDN_SPNEGO">Always allow SPNEGO on non FQDNs</checkBox>
+      </presentation>
       <presentation id="Extensions">
         <listBox refId="Extensions"/>
       </presentation>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index a6bf048..fda3d86 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -70,6 +70,28 @@
         <list id="Authentication" key="Software\Policies\Mozilla\Firefox\Authentication\NTLM" valuePrefix=""/>
       </elements>
     </policy>
+    <policy name="Authentication_AllowNonFQDN" class="Both" displayName="$(string.Authentication_AllowNonFQDN)"  key="Software\Policies\Mozilla\Firefox\Authentication\AllowNonFQDN" explainText="$(string.Authentication_AllowNonFQDN_Explain)" presentation="$(presentation.Authentication_AllowNonFQDN)">
+      <parentCategory ref="Authentication"/>
+      <supportedOn ref="SUPPORTED_FF62"/>
+      <elements>
+        <boolean id="Authentication_AllowNonFQDN_NTLM" key="Software\Policies\Mozilla\Firefox\Authentication\AllowNonFQDN" valueName="NTLM">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+        <boolean id="Authentication_AllowNonFQDN_SPNEGO" key="Software\Policies\Mozilla\Firefox\Authentication\AllowNonFQDN" valueName="SPNEGO">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+      </elements>
+    </policy>
     <policy name="BlockAboutAddons" class="Both" displayName="$(string.BlockAboutAddons)" explainText="$(string.BlockAboutAddons_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutAddons">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>