summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-06-27 10:44:36 +0200
committerLeif Johansson <leifj@sunet.se>2011-06-27 10:44:36 +0200
commit3ce7c6c81b79020993bfabe00c78ff26e12b757c (patch)
tree5f79e3a43a24acee67fd4f1733f5fbeef963b180
parent5860811c7934edc2b70cdb0cbb080e88c32c2e2f (diff)
mailfilter to kalmar
-rw-r--r--swamid-1.0/mailfilter.sunet.se.xml10
-rw-r--r--swamid-kalmar-1.0.mxml1
2 files changed, 10 insertions, 1 deletions
diff --git a/swamid-1.0/mailfilter.sunet.se.xml b/swamid-1.0/mailfilter.sunet.se.xml
index ec59f291..2fad7c4d 100644
--- a/swamid-1.0/mailfilter.sunet.se.xml
+++ b/swamid-1.0/mailfilter.sunet.se.xml
@@ -1,4 +1,3 @@
-
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mailfilter.sunet.se/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">
@@ -80,6 +79,15 @@ KHCx/w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mailfilter.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mailfilter.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mailfilter.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="0">
+ <md:ServiceName xml:lang="en">SUNET Mailfilter Service</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">SUNET Mailfilter Service</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>
diff --git a/swamid-kalmar-1.0.mxml b/swamid-kalmar-1.0.mxml
index a0c0ae96..cc32a31a 100644
--- a/swamid-kalmar-1.0.mxml
+++ b/swamid-kalmar-1.0.mxml
@@ -14,4 +14,5 @@
<xi:include href="swamid-1.0/identity.mdh.se.xml"/>
<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.sunet.se.xml"/>
</md:EntitiesDescriptor>