From 5f6bc815486a328c7b12985b9417736b7591fe06 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 16 Sep 2010 12:46:48 +0000
Subject: [PATCH] Handle importing scopes from members.xml in the case where
 the IDPSSODescriptor's Extensions element already exists.

---
 build/master_ukfederation.xsl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/build/master_ukfederation.xsl b/build/master_ukfederation.xsl
index 09047a99..cdaf7ea0 100644
--- a/build/master_ukfederation.xsl
+++ b/build/master_ukfederation.xsl
@@ -103,11 +103,13 @@
 		If an IdP's SSO or AA roles already includes an Extensions element, this may
 		already contain extensions other than scopes.  We need to make sure that
 		if it does not also contain scopes, then any scopes declared at the entity
-		level are copied down.
+		level are copied down, and any outsourced scopes provided by the member
+        list are imported.
 	-->
 	<xsl:template match="md:IDPSSODescriptor/md:Extensions |
 						 md:AttributeAuthorityDescriptor/md:Extensions">
 		<xsl:copy>
+            <xsl:variable name="entityID" select="ancestor::md:EntityDescriptor/@entityID"/>
 			<xsl:apply-templates select="node()"/>
 			<xsl:if test="not(shibmeta:Scope)">
 				<!-- copy scopes from EntityDescriptor extensions -->
@@ -116,6 +118,15 @@
 					<xsl:copy-of select="."/>
 					<xsl:text>&#10;        </xsl:text>
 				</xsl:for-each>
+                <!-- copy scopes from member outsource records -->
+                <xsl:for-each select="$outsourcedScopes[members:Entity = $entityID]/members:Scope">
+                    <xsl:text>    </xsl:text>
+                    <xsl:element name="shibmeta:Scope">
+                        <xsl:attribute name="regexp">false</xsl:attribute>
+                        <xsl:value-of select="."/>
+                    </xsl:element>
+                    <xsl:text>&#10;        </xsl:text>
+                </xsl:for-each>
 			</xsl:if>			
 		</xsl:copy>
 	</xsl:template>