From 33a6a2f0c0c31404465aa3ae2dfa15b4e75cbe2f Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 1 Sep 2017 13:12:42 +0200
Subject: Resolves SWAMIDOPS-187

---
 swamid-2.0/portaluu.onricoh.se-shibboleth.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/swamid-2.0/portaluu.onricoh.se-shibboleth.xml b/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
index a03c4db3..4c22bbf6 100644
--- a/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
+++ b/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
@@ -17,18 +17,16 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <Extensions xmlns="urn:mace:shibboleth:2.0:native:sp:config">
-          <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-            <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-              <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-              <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-            </samla:Attribute>
-          </mdattr:EntityAttributes>
-        </Extensions>
         <mdui:DisplayName xml:lang="en">eduPrint</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">eduPrint</mdui:DisplayName>
         <mdui:Description xml:lang="en">eduPrint is a print and photocopying system for students and employees at Uppsala University. Use eduPrint to print, make photocopies and scan documents and images.</mdui:Description>
-- 
cgit v1.2.3