From ec95ad380fdd7c1b378be8e483b9d9c43fc16ef4 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 15 Dec 2010 17:01:23 +0000
Subject: [PATCH] Handle <init:RequestInitiator> elements from the OASIS SAML
 TC Service Provider Request Initiation Protocol and Profile Version 1.0,
 Committee Specification 01, 5 November 2010.

---
 build/check_namespaces.xsl |  5 +++++
 build/import.xsl           | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/build/check_namespaces.xsl b/build/check_namespaces.xsl
index 8e547ed0..db580073 100644
--- a/build/check_namespaces.xsl
+++ b/build/check_namespaces.xsl
@@ -13,6 +13,7 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
@@ -43,6 +44,10 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 	
+	<xsl:template match="init:*">
+		<xsl:apply-templates/>
+	</xsl:template>
+	
 	<xsl:template match="md:*">
 		<xsl:apply-templates/>
 	</xsl:template>
diff --git a/build/import.xsl b/build/import.xsl
index e3acacbd..fba3bf88 100644
--- a/build/import.xsl
+++ b/build/import.xsl
@@ -29,6 +29,7 @@
 
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
@@ -39,7 +40,7 @@
 
 	xmlns:xalan="http://xml.apache.org/xalan"
 	
-	exclude-result-prefixes="idpdisc md xalan"
+	exclude-result-prefixes="idpdisc init md xalan"
 
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
 
@@ -60,6 +61,7 @@
 		<EntityDescriptor ID="uk000000_CHANGE_THIS"
 			xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata sstc-saml-schema-metadata-2.0.xsd
 			urn:oasis:names:tc:SAML:metadata:ui ../xml/sstc-saml-metadata-ui-v1.0.xsd
+			urn:oasis:names:tc:SAML:profiles:SSO:request-init ../xml/sstc-request-initiation.xsd
 			urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd
 			http://ukfederation.org.uk/2006/11/label uk-fed-label.xsd
 			http://www.w3.org/2001/04/xmlenc# xenc-schema.xsd
@@ -490,6 +492,18 @@
 	</xsl:template>
 	
 	
+	<!--
+		init:RequestInitiator
+		
+		Normalise namespace prefix.
+	-->
+	<xsl:template match="init:RequestInitiator">
+		<init:RequestInitiator>
+			<xsl:apply-templates select="node()|@*"/>
+		</init:RequestInitiator>
+	</xsl:template>
+	
+	
 	<!--
 		shibmd:Scope