[cpp-sp COMMIT] in /branches/REL_2: schemas/shibboleth-2.0-native-sp-config.xsd shibsp/handler/impl/SAMLDSSessionInit...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Feb 10 18:57:13 2012
New Revision: 3577

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3577&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-410

Modified:
    branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd
    branches/REL_2/shibsp/handler/impl/SAMLDSSessionInitiator.cpp

Modified: branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd?rev=3577&r1=3576&r2=3577&view=diff
==============================================================================
--- branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd (original)
+++ branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd Fri Feb 10 18:57:13 2012
@@ -244,6 +244,7 @@
     <attribute name="redirectToSSL" type="unsignedInt"/>
     <attribute name="entityID" type="anyURI"/>
     <attribute name="discoveryURL" type="anyURI"/>
+    <attribute name="discoveryPolicy" type="conf:string"/>
     <attribute name="isPassive" type="boolean"/>
     <attribute name="returnOnError" type="boolean"/>
     <attribute name="forceAuthn" type="boolean"/>
@@ -561,6 +562,7 @@
     <attribute name="SPNameQualifier" type="conf:string"/>
     <attribute name="requestDelegation" type="boolean"/>
     <attribute name="target" type="anyURI"/>
+    <attribute name="discoveryPolicy" type="conf:string"/>
     <anyAttribute namespace="##any" processContents="lax"/>
   </attributeGroup>
 

Modified: branches/REL_2/shibsp/handler/impl/SAMLDSSessionInitiator.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/handler/impl/SAMLDSSessionInitiator.cpp?rev=3577&r1=3576&r2=3577&view=diff
==============================================================================
--- branches/REL_2/shibsp/handler/impl/SAMLDSSessionInitiator.cpp (original)
+++ branches/REL_2/shibsp/handler/impl/SAMLDSSessionInitiator.cpp Fri Feb 10 18:57:13 2012
@@ -277,6 +277,9 @@
         req = req + "&returnIDParam=" + m_returnParam;
     if (isPassive)
         req += "&isPassive=true";
+    prop = getString("discoveryPolicy");
+    if (prop.first)
+        req += "&policy=" + urlenc->encode(prop.second);
 
     return make_pair(true, request.sendRedirect(req.c_str()));
 }