diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-06-16 20:25:53 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-06-16 20:25:53 +0200 |
| commit | b217869b73c7ceb7653972740e0f796cf9bbd383 (patch) | |
| tree | ca10c13dc56d3c1665f5e89759e91ede7489bffc /swamid-1.0/jabber.nordu.net.xml | |
| parent | 5b14805f2ecc3b89ea0ff9b08a8714a3b895347e (diff) | |
| parent | c5391135cbba3c20214e9e44c433925931df1453 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-1.0/shib-idp-1.oru.se.xml
Diffstat (limited to 'swamid-1.0/jabber.nordu.net.xml')
| -rw-r--r-- | swamid-1.0/jabber.nordu.net.xml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/swamid-1.0/jabber.nordu.net.xml b/swamid-1.0/jabber.nordu.net.xml index 0aa3a8b2..fb6c4bd0 100644 --- a/swamid-1.0/jabber.nordu.net.xml +++ b/swamid-1.0/jabber.nordu.net.xml @@ -1,6 +1,5 @@ - +<?xml version="1.0" encoding="UTF-8"?> <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"/> @@ -70,13 +69,13 @@ zvTzeciRKJ9UNf9ibAJGF7jz/GP5r+yUgizdV0wyikyUa8VNyrSeExBUVg== <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: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> |