From fb455038ec3f8caae5462a7aa8029b7e3e47beca Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Sun, 2 Nov 2014 21:33:55 +0100
Subject: resolves SWAMIDOPS-7408

---
 swamid-2.0/idp.sics.se-idp-shibboleth.xml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/swamid-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
index 9a461ab0..ddfbf228 100644
--- a/swamid-2.0/idp.sics.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?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://idp.sics.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0                                                 urn:oasis:names:tc:SAML:1.1:protocol                                                 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">sics.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -55,11 +55,11 @@ SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.se/idp/profile/SAML2/Redirect/SLO"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/SLO"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sics.se/idp/profile/Shibboleth/SSO"/>
@@ -106,9 +106,20 @@ SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">SICS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SICS</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">SICS</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.sics.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>SICS</Company>
+    <SurName>CRIT</SurName>
+    <EmailAddress>crit@sics.se</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
-- 
cgit v1.2.3