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/shibboleth.im.jku.at-idp-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml index b6e5906e..c8b73bef 100644 --- a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml @@ -47,8 +47,8 @@ lkm+eYJRFwZraUdycAffqQ== </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> - <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/> - <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/> + <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/> + <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/> <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/Redirect/SLO"/> <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST/SLO"/> <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/SLO"/> @@ -90,8 +90,8 @@ lkm+eYJRFwZraUdycAffqQ== </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> - <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at/idp/profile/SAML1/SOAP/AttributeQuery"/> - <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/AttributeQuery"/> + <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/> + <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat> <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat> |