From 973122507939a532d1856aab7d5fcf33e92c2300 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Thu, 20 Jul 2017 10:28:06 +0200
Subject: Move new kth idp to next step

---
 swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml | 7 +++++--
 swamid-idp-2.0.mxml                                 | 1 +
 swamid-testing-idp-1.0.mxml                         | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
index 62fbfcfd..fdde5df5 100644
--- a/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://swamid-idp.sys.kth.se/idp/shibboleth">
   <md:Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
       </saml:Attribute>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index b6d561ec..620b279a 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -19,4 +19,5 @@
   <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index e406832f..6b167bd0 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -57,6 +57,5 @@
   <xi:include href="swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.test.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3