From d74902b24569c266775779ec1d42d76271e5b50c Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 13 Jun 2013 13:44:41 +0000
Subject: [PATCH] Bugzilla 1009: mdui:DisplayName and OrganizationDisplayName
 should be the same for IdPs First step: add a "future" test for this.  Stop
 applying "future" tests to interfederation imports.

---
 mdx/_rules/check_future_0.xsl | 22 ++++++++++++++++++++++
 mdx/validation-beans.xml      |  1 -
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/mdx/_rules/check_future_0.xsl b/mdx/_rules/check_future_0.xsl
index fe932075..36c45399 100644
--- a/mdx/_rules/check_future_0.xsl
+++ b/mdx/_rules/check_future_0.xsl
@@ -30,4 +30,26 @@
 	-->
 	<xsl:import href="check_framework.xsl"/>
 
+	<!--
+		If an IdP has both an OrganizationDisplayName in English, and an
+		mdui:DisplayName in English, they must be identical.
+		
+		UKFTS 1.4 section 3.3
+	-->
+	<xsl:template match="md:EntityDescriptor[md:IDPSSODescriptor]">
+		<xsl:variable name="mdui" select="md:IDPSSODescriptor/md:Extensions/mdui:UIInfo/mdui:DisplayName[@xml:lang='en']"/>
+		<xsl:variable name="odn" select="md:Organization/md:OrganizationDisplayName[@xml:lang='en']"/>
+		<xsl:if test="$mdui and $odn and $mdui != $odn">
+			<xsl:call-template name="error">
+				<xsl:with-param name="m">
+					<xsl:text>mismatched xml:lang='en' DisplayNames: '</xsl:text>
+					<xsl:value-of select="$mdui"/>
+					<xsl:text>' in mdui vs. '</xsl:text>
+					<xsl:value-of select="$odn"/>
+					<xsl:text>' in ODN</xsl:text>
+				</xsl:with-param>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+	
 </xsl:stylesheet>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 8594ffd7..37b828ac 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -672,7 +672,6 @@
         <property name="composedStages">
             <list>
                 <ref bean="CHECK_std"/>
-                <ref bean="check_future"/>
                 <ref bean="check_regscope"/>
             </list>
         </property>