[cpp-sp] branch master updated: Remove deprecated content from 3.0 schema and adjust a log msg.

[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=d361d81e1aa0b3b90f930facce25c3d20fd7ea40

The following commit(s) were added to refs/heads/master by this push:
       new  d361d81   Remove deprecated content from 3.0 schema and adjust a log msg.
d361d81 is described below

commit d361d81e1aa0b3b90f930facce25c3d20fd7ea40
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 14 18:09:54 2018 -0500

    Remove deprecated content from 3.0 schema and adjust a log msg.
---
 schemas/shibboleth-3.0-native-sp-config.xsd | 13 ++-----------
 shibsp/impl/XMLServiceProvider.cpp          |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/schemas/shibboleth-3.0-native-sp-config.xsd b/schemas/shibboleth-3.0-native-sp-config.xsd
index 706f052..92200e4 100644
--- a/schemas/shibboleth-3.0-native-sp-config.xsd
+++ b/schemas/shibboleth-3.0-native-sp-config.xsd
@@ -112,7 +112,6 @@
         </sequence>
         <attribute name="StorageService" type="IDREF"/>
         <attribute name="cacheAllowance" type="unsignedInt"/>
-        <attribute name="cacheTimeout" type="unsignedInt"/> <!-- deprecated -->
         <attribute name="maintainReverseIndex" type="boolean"/>
         <attribute name="excludeReverseIndex" type="conf:listOfStrings"/>
         <anyAttribute namespace="##any" processContents="lax"/>
@@ -639,7 +638,6 @@
           <attribute name="isDefault" type="boolean"/>
           <attribute name="URL" type="anyURI"/>
           <attribute name="acsIndex" type="unsignedShort"/>
-          <attribute name="defaultACSIndex" type="unsignedShort"/>  <!-- deprecated -->
           <attributeGroup ref="conf:SessionInitiatorGroup"/>
         </restriction>
       </complexContent>
@@ -828,10 +826,7 @@
         <element name="ArtifactMap" type="conf:ArtifactMapType" minOccurs="0"/>
         <element name="RequestMapper" type="conf:PluggableType" minOccurs="0"/>
         <element name="ApplicationDefaults" type="conf:ApplicationDefaultsType"/>
-        <choice>
-          <element name="SecurityPolicyProvider" type="conf:PluggableType"/>
-          <element ref="conf:SecurityPolicies"/> <!-- deprecated -->
-        </choice>
+        <element name="SecurityPolicyProvider" type="conf:PluggableType"/>
         <element name="ProtocolProvider" type="conf:PluggableType" minOccurs="0"/>
         <element ref="conf:TransportOption" minOccurs="0" maxOccurs="unbounded"/>
         <element ref="ds:Signature" minOccurs="0"/>
@@ -842,11 +837,7 @@
       <attribute name="allowedSchemes" type="conf:listOfStrings"/>
       <attribute name="langFromClient" type="boolean"/>
       <attribute name="langPriority" type="conf:listOfStrings"/>
-      <attribute name="contactPriority" type="conf:listOfStrings"/>
-      
-      <!-- Unsupported. -->
-      <attribute name="disableDTD" type="boolean"/>
-      
+      <attribute name="contactPriority" type="conf:listOfStrings"/>      
       <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
   </element>
diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp
index 2426478..0c93a3d 100644
--- a/shibsp/impl/XMLServiceProvider.cpp
+++ b/shibsp/impl/XMLServiceProvider.cpp
@@ -2163,7 +2163,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, XMLConfig* outer,
         // For backward compatibility, wrap in a plugin element.
         DOMElement* polwrapper = e->getOwnerDocument()->createElementNS(nullptr, _SecurityPolicyProvider);
         polwrapper->appendChild(child);
-        log.warn("deprecated/legacy SecurityPolicy configuration, consider externalizing with <SecurityPolicyProvider>");
+        log.warn("DEPRECATED: inline SecurityPolicy configuration, externalize via <SecurityPolicyProvider>");
         m_policy.reset(conf.SecurityPolicyProviderManager.newPlugin(XML_SECURITYPOLICY_PROVIDER, polwrapper));
     }
     else {

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