[cpp-sp] branch master updated: SSPCPP-847 - Macport build fails with linker error

[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=3a2cb2c3938ade52e9e8834c27b5d67d74edf4aa

The following commit(s) were added to refs/heads/master by this push:
       new  3a2cb2c   SSPCPP-847 - Macport build fails with linker error
3a2cb2c is described below

commit 3a2cb2c3938ade52e9e8834c27b5d67d74edf4aa
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Mar 7 15:27:00 2019 -0500

    SSPCPP-847 - Macport build fails with linker error
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-847
    
    Remove additional improper boost::bind usage.
---
 shibsp/impl/StorageServiceSessionCache.cpp |  4 +++-
 shibsp/impl/XMLApplication.cpp             | 20 +++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/shibsp/impl/StorageServiceSessionCache.cpp b/shibsp/impl/StorageServiceSessionCache.cpp
index b3f3212..271395b 100644
--- a/shibsp/impl/StorageServiceSessionCache.cpp
+++ b/shibsp/impl/StorageServiceSessionCache.cpp
@@ -1402,7 +1402,9 @@ void* SSCache::cleanup_fn(void* p)
             pcache->m_log.info("purging %d old sessions", stale_keys.size());
 
             // Pass 2: walk through the list of stale entries and remove them from the cache
-            for_each(stale_keys.begin(), stale_keys.end(), boost::bind(&SSCache::dormant, pcache, boost::bind(&string::c_str, _1)));
+            for (vector<string>::const_iterator i = stale_keys.begin(); i != stale_keys.end(); ++i) {
+                pcache->dormant(i->c_str());
+            }
         }
 
         pcache->m_log.debug("cleanup thread completed");
diff --git a/shibsp/impl/XMLApplication.cpp b/shibsp/impl/XMLApplication.cpp
index 97abe20..622f4f1 100644
--- a/shibsp/impl/XMLApplication.cpp
+++ b/shibsp/impl/XMLApplication.cpp
@@ -1545,14 +1545,20 @@ void XMLApplication::limitRedirect(const GenericRequest& request, const char* ur
             whitelist.push_back(string("http://") + request.getHostname() + ':');
         }
 
-        static bool (*startsWithI)(const char*,const char*) = XMLString::startsWithI;
-        if (!whitelist.empty() && find_if(whitelist.begin(), whitelist.end(),
-                boost::bind(startsWithI, url, boost::bind(&string::c_str, _1))) != whitelist.end()) {
-            return;
+        if (!whitelist.empty()) {
+            for (vector<string>::const_iterator i = whitelist.begin(); i != whitelist.end(); ++i) {
+                if (XMLString::startsWithI(url, i->c_str())) {
+                    return;
+                }
+            }
         }
-        else if (!m_redirectWhitelist.empty() && find_if(m_redirectWhitelist.begin(), m_redirectWhitelist.end(),
-                boost::bind(startsWithI, url, boost::bind(&string::c_str, _1))) != m_redirectWhitelist.end()) {
-            return;
+
+        if (!m_redirectWhitelist.empty()) {
+            for (vector<string>::const_iterator i = m_redirectWhitelist.begin(); i != m_redirectWhitelist.end(); ++i) {
+                if (XMLString::startsWithI(url, i->c_str())) {
+                    return;
+                }
+            }
         }
         Category::getInstance(SHIBSP_LOGCAT ".Application").warn("redirectLimit policy enforced, blocked redirect to (%s)", url);
         throw opensaml::SecurityPolicyException("Blocked unacceptable redirect location.");

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