From 605dc780a24ca97dd2c8a01da2b8d512a33c3b4d Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Tue, 28 May 2019 10:28:07 +0200
Subject: Resolved SWAMID-2232

---
 swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml | 1 +
 swamid-edugain-sp-1.0.mxml                              | 1 +
 swamid-sp-2.0.mxml                                      | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
index dc2717d3..605ca1a6 100644
--- a/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
+++ b/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index d5b58b0f..b8125a72 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -40,4 +40,5 @@
   <xi:include href="swamid-2.0/acs-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index a66712c0..31cede7e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -348,7 +348,6 @@
   <xi:include href="swamid-2.0/student.test.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-kau-student-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-kau-employee-sp.xml"/>
-  <xi:include href="swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-ssh-sp.xml"/>
-- 
cgit v1.2.3