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/press.endocrine.org-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml b/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml index bee26c5a..45097b1c 100644 --- a/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml +++ b/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml @@ -35,8 +35,8 @@ </ds:KeyInfo> </KeyDescriptor> <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://press.endocrine.org/action/samlACS" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://press.endocrine.org/action/samlACS" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://press.endocrine.org/action/samlACS" index="3"/> + <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://press.endocrine.org/action/saml2post" index="2"/> + <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://press.endocrine.org/action/saml2artifact" index="3"/> </SPSSODescriptor> <Organization> <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName> |