From 09862da6ddc1e821d761fec82977b3943d5d3051 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 25 Jun 2014 16:55:37 +0000
Subject: [PATCH] Promote no-KeyName in SP rule and make it apply to all
 entities. This now appears in the latest draft of FTS 1.5.

---
 mdx/_rules/check_future_0.xsl |  6 ------
 mdx/_rules/check_uk_trust.xsl | 11 +++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mdx/_rules/check_future_0.xsl b/mdx/_rules/check_future_0.xsl
index aef9a141..fe932075 100644
--- a/mdx/_rules/check_future_0.xsl
+++ b/mdx/_rules/check_future_0.xsl
@@ -30,10 +30,4 @@
 	-->
 	<xsl:import href="check_framework.xsl"/>
 
-	<xsl:template match="md:SPSSODescriptor[descendant::ds:KeyName]">
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">service provider with KeyName element</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>
-	
 </xsl:stylesheet>
diff --git a/mdx/_rules/check_uk_trust.xsl b/mdx/_rules/check_uk_trust.xsl
index 378c3a30..6db92755 100644
--- a/mdx/_rules/check_uk_trust.xsl
+++ b/mdx/_rules/check_uk_trust.xsl
@@ -104,4 +104,15 @@
 		</xsl:call-template>
 	</xsl:template>
 
+	<!--
+		FTS 1.5 draft of 2014-06-25, section 3.10, last paragraph.
+		
+		<ds:KeyName> elements SHALL NOT be accepted in locally registered metadata
+	-->
+	<xsl:template match="ds:KeyName">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">entity has legacy KeyName element</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
 </xsl:stylesheet>