From 0d57bdc3cf92ca4a569eae685925ea8578457cbb Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 17 May 2012 17:11:23 +0000
Subject: [PATCH] Move saml2int check for NameID formats to production now that
 all entities comply.

---
 build/check_saml2int.xsl |  2 --
 mdx/check_future_1.xsl   | 15 ---------------
 2 files changed, 17 deletions(-)

diff --git a/build/check_saml2int.xsl b/build/check_saml2int.xsl
index 9f037c0f..83f9ecaa 100644
--- a/build/check_saml2int.xsl
+++ b/build/check_saml2int.xsl
@@ -36,7 +36,6 @@
 		
 		Check for SAML 2.0 SPs which exclude both transient and persistent SAML 2 name identifier formats.
 	-->
-	<!--
 	<xsl:template match="md:SPSSODescriptor
 		[contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')]
 		[md:NameIDFormat]
@@ -46,7 +45,6 @@
 			<xsl:with-param name="m">SP excludes both SAML 2 name identifier formats</xsl:with-param>
 		</xsl:call-template>
 	</xsl:template>
-	-->
 	
 	<!--
 		Section 6.
diff --git a/mdx/check_future_1.xsl b/mdx/check_future_1.xsl
index 3881e88e..255e2fba 100644
--- a/mdx/check_future_1.xsl
+++ b/mdx/check_future_1.xsl
@@ -30,19 +30,4 @@
 	<xsl:import href="../build/check_framework.xsl"/>
 
 	
-	<!--
-        Section 6.
-        
-        Check for SAML 2.0 SPs which exclude both transient and persistent SAML 2 name identifier formats.
-    -->
-    <xsl:template match="md:SPSSODescriptor
-        [contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')]
-        [md:NameIDFormat]
-        [not(md:NameIDFormat[.='urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'])]
-        [not(md:NameIDFormat[.='urn:oasis:names:tc:SAML:2.0:nameid-format:transient'])]">
-        <xsl:call-template name="error">
-            <xsl:with-param name="m">saml2int: SP excludes both SAML 2 name identifier formats</xsl:with-param>
-        </xsl:call-template>
-    </xsl:template>
-	
 </xsl:stylesheet>