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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb  1 17:38:52 2012
New Revision: 3567

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3567&view=rev
Log:
Add schema for new config settings

Modified:
    branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd
    branches/REL_2/shibsp/impl/XMLServiceProvider.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=3567&r1=3566&r2=3567&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 Wed Feb  1 17:38:52 2012
@@ -762,6 +762,9 @@
       <attribute name="clockSkew" type="unsignedInt"/>
       <attribute name="unsafeChars" type="conf:string"/>
       <attribute name="allowedSchemes" type="conf:listOfStrings"/>
+      <attribute name="langFromClient" type="boolean"/>
+      <attribute name="langPriority" type="conf:listOfStrings"/>
+      <attribute name="contactPriority" type="conf:listOfStrings"/>
       <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
   </element>

Modified: branches/REL_2/shibsp/impl/XMLServiceProvider.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/impl/XMLServiceProvider.cpp?rev=3567&r1=3566&r2=3567&view=diff
==============================================================================
--- branches/REL_2/shibsp/impl/XMLServiceProvider.cpp (original)
+++ branches/REL_2/shibsp/impl/XMLServiceProvider.cpp Wed Feb  1 17:38:52 2012
@@ -1888,6 +1888,12 @@
         pair<bool,const XMLCh*> langPriority = getXMLString("langPriority");
         GenericRequest::setLangDefaults(!langFromClient.first || langFromClient.second, langPriority.second);
 
+#ifndef SHIBSP_LITE
+        langPriority = getXMLString("contactPriority");
+        if (langPriority.first)
+            SAMLConfig::getConfig().setContactPriority(langPriority.second);
+#endif
+
         // Extensions
         doExtensions(e, "global", log);
         if (conf.isEnabled(SPConfig::OutOfProcess))