From 3c38934563268cfa5e9a121945a08a6b301179a2 Mon Sep 17 00:00:00 2001
From: Johan Berggren <jbn@nordu.net>
Date: Fri, 9 Sep 2011 10:35:58 +0200
Subject: Added jabber.nordu.net to Kalmar

---
 swamid-1.0/jabber.nordu.net.xml | 12 ++++++++++--
 swamid-kalmar-1.0.mxml          |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/swamid-1.0/jabber.nordu.net.xml b/swamid-1.0/jabber.nordu.net.xml
index 99d9047a..ae2d1cf4 100644
--- a/swamid-1.0/jabber.nordu.net.xml
+++ b/swamid-1.0/jabber.nordu.net.xml
@@ -66,6 +66,14 @@ zvTzeciRKJ9UNf9ibAJGF7jz/GP5r+yUgizdV0wyikyUa8VNyrSeExBUVg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jabber.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jabber.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jabber.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+       <md:ServiceName xml:lang="en">Jabber at NORDUnet</md:ServiceName>
+       <md:ServiceDescription xml:lang="en">Jabber at NORDUnet</md:ServiceDescription>
+       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-kalmar-1.0.mxml b/swamid-kalmar-1.0.mxml
index a46d62f3..b7539385 100644
--- a/swamid-kalmar-1.0.mxml
+++ b/swamid-kalmar-1.0.mxml
@@ -15,4 +15,5 @@
   <xi:include href="swamid-1.0/hbidp.hb.se.xml"/>
   <xi:include href="swamid-1.0/nordunet.tv.xml"/>
   <xi:include href="swamid-1.0/mailfilter.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/jabber.nordu.net.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3


From 4ac473e43cdf6cb6a9ce3460a997d745ee147496 Mon Sep 17 00:00:00 2001
From: Johan Berggren <jbn@nordu.net>
Date: Tue, 13 Sep 2011 12:15:07 +0200
Subject: Updated jabber.nordu.net md

---
 swamid-1.0/jabber.nordu.net.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/swamid-1.0/jabber.nordu.net.xml b/swamid-1.0/jabber.nordu.net.xml
index ae2d1cf4..0aa3a8b2 100644
--- a/swamid-1.0/jabber.nordu.net.xml
+++ b/swamid-1.0/jabber.nordu.net.xml
@@ -2,6 +2,9 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jabber.nordu.net/shibboleth">
 
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jabber.nordu.net/Shibboleth.sso/DS/nordu.net" index="1"/>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>jabber.nordu.net</ds:KeyName>
-- 
cgit v1.2.3