Renamed Domain extension to Scope.

diff --git a/configs/IQ-sites.xml.in b/configs/IQ-sites.xml.in
index 1a96b4d..3a9f08f 100644 (file)
--- a/configs/IQ-sites.xml.in
+++ b/configs/IQ-sites.xml.in
@@ -16,7 +16,7 @@
        <EntityDescriptor entityID="urn:mace:inqueue:example.edu">
                <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
                        <Extensions>
-                       <shib:Domain xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Domain>
+                       <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Scope>
                        </Extensions>
                        <KeyDescriptor use="signing">
                            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -29,7 +29,7 @@
                </IDPSSODescriptor>
                <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
                        <Extensions>
-                       <shib:Domain xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Domain>
+                       <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.edu</shib:Scope>
                        </Extensions>
                        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
                            Location="https://wayf.internet2.edu/shibboleth-1.2/AA"/>

diff --git a/configs/shibboleth.xml.in b/configs/shibboleth.xml.in
index f9a4af4..597eab5 100644 (file)
--- a/configs/shibboleth.xml.in
+++ b/configs/shibboleth.xml.in
@@ -135,7 +135,7 @@
                        <EntityDescriptor entityID="https://example.org/shibboleth" xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
                                <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
                                        <Extensions>
-                                       <shib:Domain xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.org</shib:Domain>
+                                       <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.org</shib:Scope>
                                        </Extensions>
                                        <KeyDescriptor use="signing">
                                            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -148,7 +148,7 @@
                                </IDPSSODescriptor>
                                <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
                                        <Extensions>
-                                       <shib:Domain xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.org</shib:Domain>
+                                       <shib:Scope xmlns:shib="urn:mace:shibboleth:metadata:1.0">example.org</shib:Scope>
                                        </Extensions>
                                        <KeyDescriptor>
                                            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">

diff --git a/schemas/shibboleth-metadata-1.0.xsd b/schemas/shibboleth-metadata-1.0.xsd
index 824a00e..a520ca4 100644 (file)
--- a/schemas/shibboleth-metadata-1.0.xsd
+++ b/schemas/shibboleth-metadata-1.0.xsd
@@ -5,7 +5,7 @@
        attributeFormDefault="unqualified"
        version="1.0">
 
-       <element name="Domain">
+       <element name="Scope">
                <annotation>
                        <documentation>
                        SAML metadata extension used to regulate allowable attribute scopes.

diff --git a/xmlproviders/XMLMetadata.cpp b/xmlproviders/XMLMetadata.cpp
index 93f6ed8..8214911 100644 (file)
--- a/xmlproviders/XMLMetadata.cpp
+++ b/xmlproviders/XMLMetadata.cpp
@@ -714,7 +714,7 @@ XMLMetadataImpl::ScopedRole::ScopedRole(const DOMElement* e)
     DOMNodeList* nlist=NULL;
     if (!XMLString::compareString(e->getNamespaceURI(),::XML::SAML2META_NS)) {
         e=saml::XML::getFirstChildElement(e,::XML::SAML2META_NS,SHIB_L(Extensions));
-        nlist=e->getElementsByTagNameNS(::XML::SHIBMETA_NS,SHIB_L(Domain));
+        nlist=e->getElementsByTagNameNS(::XML::SHIBMETA_NS,SHIB_L(Scope));
     }
     else {
         nlist=e->getElementsByTagNameNS(::XML::SHIB_NS,SHIB_L(Domain));