From e403596bfbdad4ba2948e4d2248586c44f53f685 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 12 Feb 2008 15:19:11 +0000
Subject: [PATCH] Allow IdP scope lists to be presented at the EntityDescriptor
 level alone.  Published metadata includes all three sets, with the two inner
 Extensions blocks generated from the outer one.

---
 build/master_ukfederation.xsl | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/build/master_ukfederation.xsl b/build/master_ukfederation.xsl
index 02067b17..2be990df 100644
--- a/build/master_ukfederation.xsl
+++ b/build/master_ukfederation.xsl
@@ -60,6 +60,33 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="md:AttributeAuthorityDescriptor[not(md:Extensions)]">
+		<xsl:copy>
+			<xsl:apply-templates select="@*"/>
+			<xsl:text>&#10;        </xsl:text><Extensions>
+				<xsl:for-each select="ancestor::md:EntityDescriptor/md:Extensions/shibmeta:Scope">
+					<xsl:text>&#10;            </xsl:text>
+					<xsl:copy-of select="."/>
+				</xsl:for-each>
+				<!--<xsl:apply-templates select="ancestor::md:EntityDescriptor/md:Extensions/shibmeta:Scope"/>-->
+				<xsl:text>&#10;        </xsl:text></Extensions>
+			<xsl:apply-templates select="node()"/>
+		</xsl:copy>
+	</xsl:template>
+	
+	<xsl:template match="md:IDPSSODescriptor[not(md:Extensions)]">
+		<xsl:copy>
+			<xsl:apply-templates select="@*"/>
+			<xsl:text>&#10;        </xsl:text><Extensions>
+				<xsl:for-each select="ancestor::md:EntityDescriptor/md:Extensions/shibmeta:Scope">
+					<xsl:text>&#10;            </xsl:text>
+					<xsl:copy-of select="."/>
+				</xsl:for-each>
+				<xsl:text>&#10;        </xsl:text></Extensions>
+			<xsl:apply-templates select="node()"/>
+		</xsl:copy>
+	</xsl:template>
+	
 	<!--
 		Drop any explicit xsi:schemaLocation attributes from imported entity fragments.
 	-->