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/hexaa.eduid.hu-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml b/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml index 1087451f..6eead834 100644 --- a/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml +++ b/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml @@ -33,8 +33,8 @@ </md:KeyDescriptor> <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hexaa.eduid.hu/Shibboleth.sso/SLO/Redirect"/> <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/Artifact" index="1"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/> <md:AttributeConsumingService index="1" isDefault="true"> <md:ServiceName xml:lang="hu">HEXAA</md:ServiceName> <md:ServiceName xml:lang="en">HEXAA</md:ServiceName> |