From fa4626dca042107c90adec4f330239d6ad532e2a Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 25 May 2011 08:34:36 +0000
Subject: [PATCH] Provide more information about Attribute and
 RequestedAttribute errors.

---
 build/check_saml2int.xsl | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/build/check_saml2int.xsl b/build/check_saml2int.xsl
index a52d4797..5bab9d22 100644
--- a/build/check_saml2int.xsl
+++ b/build/check_saml2int.xsl
@@ -71,12 +71,21 @@
 	-->
 	<xsl:template match="saml:Attribute[not(@NameFormat)]">
 		<xsl:call-template name="error">
-			<xsl:with-param name="m">SAML2Int: Attribute element lacks NameFormat attribute</xsl:with-param>
+			<xsl:with-param name="m">
+				<xsl:text>Attribute </xsl:text>
+				<xsl:value-of select="@Name"/>
+				<xsl:text> lacks NameFormat attribute</xsl:text>
+			</xsl:with-param>
 		</xsl:call-template>
 	</xsl:template>
 	<xsl:template match="saml:Attribute[@NameFormat][not(@NameFormat='urn:oasis:names:tc:SAML:2.0:attrname-format:uri')]">
 		<xsl:call-template name="error">
-			<xsl:with-param name="m">SAML2Int: Attribute element has incorrect NameFormat attribute</xsl:with-param>
+			<xsl:with-param name="m">
+				<xsl:text>Attribute </xsl:text>
+				<xsl:value-of select="@Name"/>
+				<xsl:text> has incorrect NameFormat </xsl:text>
+				<xsl:value-of select="@NameFormat"/>
+			</xsl:with-param>
 		</xsl:call-template>
 	</xsl:template>
 	
@@ -87,12 +96,21 @@
 	-->
 	<xsl:template match="md:RequestedAttribute[not(@NameFormat)]">
 		<xsl:call-template name="error">
-			<xsl:with-param name="m">SAML2IntX: RequestedAttribute element lacks NameFormat attribute</xsl:with-param>
+			<xsl:with-param name="m">
+				<xsl:text>(X) RequestedAttribute </xsl:text>
+				<xsl:value-of select="@Name"/>
+				<xsl:text> lacks NameFormat attribute</xsl:text>
+			</xsl:with-param>
 		</xsl:call-template>
 	</xsl:template>
 	<xsl:template match="md:RequestedAttribute[@NameFormat][not(@NameFormat='urn:oasis:names:tc:SAML:2.0:attrname-format:uri')]">
 		<xsl:call-template name="error">
-			<xsl:with-param name="m">SAML2IntX: RequestedAttribute element has incorrect NameFormat attribute</xsl:with-param>
+			<xsl:with-param name="m">
+				<xsl:text>(X) RequestedAttribute </xsl:text>
+				<xsl:value-of select="@Name"/>
+				<xsl:text>  has incorrect NameFormat </xsl:text>
+				<xsl:value-of select="@NameFormat"/>
+			</xsl:with-param>
 		</xsl:call-template>
 	</xsl:template>