From d6df2247938734f6381eabecf4949cc61ac2503e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 13 Aug 2015 09:55:51 +0000
Subject: [PATCH] Disallow empty samlmd:Scope elements.

---
 mdx/common-beans.xml     | 2 ++
 mdx/validation-beans.xml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index f28e2aa6..bd138125 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -838,6 +838,8 @@
         *****************************************************
     -->
     
+    <bean id="shibmd-Scope" parent="QName" c:_0-ref="shibmd_namespace" c:_1="Scope"/>
+
     <bean id="stripShibScope" parent="ElementStrippingStage"
         p:id="stripShibScope"
         p:elementName="Scope"
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index d99e7cd6..27094121 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -602,6 +602,8 @@
                 <ref bean="mdui-GeolocationHint"/>
                 <ref bean="mdui-IPHint"/>
                 <ref bean="mdui-Keywords"/>
+
+                <ref bean="shibmd-Scope"/>
             </set>
         </property>
     </bean>