From f552c676a6fcfc4d89a91ef872cd45440066af61 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Thu, 28 Feb 2019 13:15:09 +0100
Subject: Resolved SWAMID-2025

---
 swamid-2.0/fs.liu.se-adfs-services-trust.xml  | 16 ++++++++--------
 swamid-2.0/login.it.liu.se-idp-shibboleth.xml | 11 +++++++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index 5be0e15a..dcbb5e7c 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -21,10 +21,10 @@
   <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Linköpings universitet (ADFS)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University (ADFS)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Linköpings universitet (ADFS)</mdui:Description>
-        <mdui:Description xml:lang="en">Linköping University (ADFS)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Linköpings universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Linköping University</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://liu.se/artikel/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
@@ -91,8 +91,8 @@ uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
     <Extensions>
       <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Linköpings universitet (ADFS)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University (ADFS)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
@@ -169,8 +169,8 @@ uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
   <Organization>
     <OrganizationName xml:lang="sv">Linköpings universitet</OrganizationName>
     <OrganizationName xml:lang="en">Linköping University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Linköpings universitet (ADFS)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Linköpings universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.liu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.liu.se/en</OrganizationURL>
   </Organization>
diff --git a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml b/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
index dc4dba0a..fe11c9d3 100644
--- a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
@@ -7,6 +7,9 @@
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
         <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
       </saml:Attribute>
+      <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>
       <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>
@@ -17,8 +20,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Linköpings Universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Linköpings Universitet - old</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Linköping University - old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
         <mdui:Logo height="68" width="350">https://login.it.liu.se/images/logo/logo-350x68-sv.png</mdui:Logo>
@@ -209,8 +212,8 @@ RZPA+Q2niYC920FIv6uscwfFJR4PEFBA83wLSZ39FDm79HM3TNQ9KFtgLY8=
   <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">LiU</OrganizationName>
     <OrganizationName xml:lang="en">LiU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Linköpings Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Linköpings Universitet - old</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Linköping University - old</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://liu.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://liu.se/en</OrganizationURL>
   </Organization>
-- 
cgit v1.2.3