From 85407eeb8a97be29049ae39fa3bd8ccd75a5025d Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sun, 29 Dec 2019 17:54:18 +0000
Subject: [PATCH] Move check_hasreginfo to eduGAIN import policy

Move this check from a location where its effects may be discarded into the general policy checks so that results are always visible.

See ukf/ukf-meta#210.
---
 mdx/int_edugain/beans.xml |  6 ------
 mdx/uk/edugain-policy.xml | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 6d87151b..79f64ae1 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -94,12 +94,6 @@
                 <ref bean="disassemble"/>
 
                 <ref bean="int_edugain_removeBlacklistedEntities"/>
-
-                <!--
-                    All eduGAIN entities should have mdrpi:RegistrationInfo elements, but
-                    we can't check the actual values.
-                -->
-                <ref bean="check_hasreginfo"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/uk/edugain-policy.xml b/mdx/uk/edugain-policy.xml
index 78914b35..af68a6e7 100644
--- a/mdx/uk/edugain-policy.xml
+++ b/mdx/uk/edugain-policy.xml
@@ -121,6 +121,25 @@
                     </property>
                 </bean>
 
+                <!--
+                    ***************************************************
+                    ***                                             ***
+                    ***   U K   F E D E R A T I O N   P O L I C Y   ***
+                    ***                                             ***
+                    ***************************************************
+
+                    The following policy elements are not documented as part
+                    of InCommon's eduGAIN import policy. Some may be
+                    _implemented_ as part of eduGAIN's effective policy, but
+                    not documented as such.
+                -->
+
+                <!--
+                    All eduGAIN entities should have mdrpi:RegistrationInfo elements, but
+                    we can't check the actual values.
+                -->
+                <ref bean="check_hasreginfo"/>
+
             </list>
         </property>
     </bean>