diff options
author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml')
-rw-r--r-- | swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml b/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml index 77eea042..2284ec29 100644 --- a/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml +++ b/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml @@ -72,6 +72,14 @@ </KeyDescriptor> <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathens.warc.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/> <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathens.warc.com/oa/auth/rcv/saml2/post" index="2"/> + <AttributeConsumingService index="1"> + <ServiceName xml:lang="en">Warc.com</ServiceName> + <ServiceDescription xml:lang="en"> + The largest single source of intelligence for marketing, advertising, media and research communities + </ServiceDescription> + <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/> + <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/> + </AttributeConsumingService> </SPSSODescriptor> <Organization> <OrganizationName xml:lang="en">WARC Limited</OrganizationName> |