Merge pull request #40 from mozilla/Authentication_policy

[policy-templates.git] / windows / firefox.admx

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 15119024aaeaa323b76f4d0259457bda41b92650..351fabd7a843862f5a0ec5afee1fdf1d0f3d6799 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -36,8 +36,32 @@
     <category displayName="$(string.Homepage_group)" name="Homepage">
       <parentCategory ref="firefox"/>
     </category>
     <category displayName="$(string.Homepage_group)" name="Homepage">
       <parentCategory ref="firefox"/>
     </category>

+    <category displayName="$(string.Authentication_group)" name="Authentication">
+      <parentCategory ref="firefox"/>
+    </category>

   </categories>
   <policies>
   </categories>
   <policies>

+    <policy name="Authentication_SPNEGO" class="Both" displayName="$(string.Authentication_SPNEGO)"  key="Software\Policies\Mozilla\Firefox\Authentication\SPNEGO" explainText="$(string.Authentication_SPNEGO_Explain)" presentation="$(presentation.Authentication)">
+      <parentCategory ref="Authentication"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <elements>
+        <list id="Authentication" key="Software\Policies\Mozilla\Firefox\Authentication\SPNEGO" valuePrefix=""/>
+      </elements>
+    </policy>
+    <policy name="Authentication_Delegated" class="Both" displayName="$(string.Authentication_Delegated)"  key="Software\Policies\Mozilla\Firefox\Authentication\Delegated" explainText="$(string.Authentication_Delegated_Explain)" presentation="$(presentation.Authentication)">
+      <parentCategory ref="Authentication"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <elements>
+        <list id="Authentication" key="Software\Policies\Mozilla\Firefox\Authentication\Delegated" valuePrefix=""/>
+      </elements>
+    </policy>
+    <policy name="Authentication_NTLM" class="Both" displayName="$(string.Authentication_NTLM)"  key="Software\Policies\Mozilla\Firefox\Authentication\NTLM" explainText="$(string.Authentication_NTLM_Explain)" presentation="$(presentation.Authentication)">
+      <parentCategory ref="Authentication"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <elements>
+        <list id="Authentication" key="Software\Policies\Mozilla\Firefox\Authentication\NTLM" valuePrefix=""/>
+      </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_WINXPSP2"/>
     <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_WINXPSP2"/>


@@ -516,12 +540,12 @@
         <enum id="SOCKSVersion" valueName="SOCKSVersion">
           <item displayName="$(string.SOCKSVersion4)">
             <value>
         <enum id="SOCKSVersion" valueName="SOCKSVersion">
           <item displayName="$(string.SOCKSVersion4)">
             <value>

-              <string>4</string>
+              <decimal value="4"/>

             </value>
           </item>
           <item displayName="$(string.SOCKSVersion5)">
             <value>
             </value>
           </item>
           <item displayName="$(string.SOCKSVersion5)">
             <value>

-              <string>5</string>
+              <decimal value="5"/>

             </value>
           </item>
         </enum>
             </value>
           </item>
         </enum>