From 235ce06fdd015bfa0e499f63c715ecae799853fa Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 2 Oct 2020 14:26:30 +0000
Subject: Fix for SWAMID-3348

---
 .../federation.uniarts.se-adfs-services-trust.xml  | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/federation.uniarts.se-adfs-services-trust.xml b/swamid-2.0/federation.uniarts.se-adfs-services-trust.xml
index 6b047c83..dd9f14d2 100644
--- a/swamid-2.0/federation.uniarts.se-adfs-services-trust.xml
+++ b/swamid-2.0/federation.uniarts.se-adfs-services-trust.xml
@@ -4,23 +4,21 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <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-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
+      <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
       </saml:Attribute>
-    </attr:EntityAttributes>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns="" regexp="false">uniarts.se</shibmd:Scope>
-      <shibmd:Scope xmlns="" regexp="false">student.uniarts.se</shibmd:Scope>
-      <mdui:UIInfo xmlns="">
+      <shibmd:Scope regexp="false">uniarts.se</shibmd:Scope>
+      <shibmd:Scope regexp="false">student.uniarts.se</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Stockholms konstnärliga högskola - TEST</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Stockholm University of the Arts - TEST</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för uniarts.se.</mdui:Description>
-- 
cgit v1.2.3