From dcfea75f7e204fdbc49fcba07b445f76d69a6197 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Tue, 18 Apr 2017 08:13:40 +0200
Subject: Resolved SWAMIDOPS-8552

---
 swamid-2.0/login.it.liu.se-idp-shibboleth.xml | 11 ++++-------
 swamid-2.0/login.liu.se-idp-shibboleth.xml    |  7 +++++--
 2 files changed, 9 insertions(+), 9 deletions(-)

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 d3bd566d..0c6ef343 100644
--- a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
@@ -6,17 +6,14 @@
         <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>
-      <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>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <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 Universitet2</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University2</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>
@@ -207,8 +204,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 Universitet2</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Linköping University2</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>
diff --git a/swamid-2.0/login.liu.se-idp-shibboleth.xml b/swamid-2.0/login.liu.se-idp-shibboleth.xml
index e869df16..5bc13f59 100644
--- a/swamid-2.0/login.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.liu.se-idp-shibboleth.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://login.liu.se/idp/shibboleth">
   <Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
+      <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>
+      <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>
     </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-- 
cgit v1.2.3