[cpp-sp] branch master updated: Pull deprecated Audience element from schema.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=6e87bb6a193c3214c01934879e2b3b3343fecbee

The following commit(s) were added to refs/heads/master by this push:
       new  6e87bb6   Pull deprecated Audience element from schema.
6e87bb6 is described below

commit 6e87bb6a193c3214c01934879e2b3b3343fecbee
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 26 17:26:26 2018 -0400

    Pull deprecated Audience element from schema.
---
 schemas/shibboleth-3.0-native-sp-config.xsd | 2 --
 shibsp/impl/XMLApplication.cpp              | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/schemas/shibboleth-3.0-native-sp-config.xsd b/schemas/shibboleth-3.0-native-sp-config.xsd
index ffaffbb..24a0aec 100644
--- a/schemas/shibboleth-3.0-native-sp-config.xsd
+++ b/schemas/shibboleth-3.0-native-sp-config.xsd
@@ -425,7 +425,6 @@
       <choice minOccurs="0" maxOccurs="unbounded">
         <element name="RelyingParty" type="conf:RelyingPartyType"/>
         <element name="Notify" type="conf:NotifyType"/>
-        <element ref="saml:Audience"/>
         <element name="MetadataProvider" type="conf:PluggableType"/>
         <element name="TrustEngine" type="conf:PluggableType"/>
         <element name="AttributeExtractor" type="conf:PluggableType"/>
@@ -452,7 +451,6 @@
       <choice minOccurs="0" maxOccurs="unbounded">
         <element name="RelyingParty" type="conf:RelyingPartyType"/>
         <element name="Notify" type="conf:NotifyType"/>
-        <element ref="saml:Audience"/>
         <element name="MetadataProvider" type="conf:PluggableType"/>
         <element name="TrustEngine" type="conf:PluggableType"/>
         <element name="AttributeExtractor" type="conf:PluggableType"/>
diff --git a/shibsp/impl/XMLApplication.cpp b/shibsp/impl/XMLApplication.cpp
index 9b3237f..33448f4 100644
--- a/shibsp/impl/XMLApplication.cpp
+++ b/shibsp/impl/XMLApplication.cpp
@@ -225,7 +225,7 @@ XMLApplication::XMLApplication(
 #ifndef SHIBSP_LITE
     nlist = e->getElementsByTagNameNS(samlconstants::SAML20_NS, Audience::LOCAL_NAME);
     if (nlist && nlist->getLength()) {
-        log.warn("use of <saml:Audience> elements outside of a Security Policy Rule is deprecated");
+        log.warn("DEPRECATED: use of <saml:Audience> elements outside of a Security Policy Rule");
         for (XMLSize_t i = 0; i < nlist->getLength(); ++i)
             if (nlist->item(i)->getParentNode()->isSameNode(e) && nlist->item(i)->hasChildNodes())
                 m_audiences.push_back(nlist->item(i)->getFirstChild()->getNodeValue());

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.