[cpp-sp] branch master updated: CPPXT-130 - auto_ptr cleanup

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

The following commit(s) were added to refs/heads/master by this push:
       new  cbb4f8b   CPPXT-130 - auto_ptr cleanup
cbb4f8b is described below

commit cbb4f8b291a94d922480ad4360bc6751a462ff8f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Apr 6 17:11:39 2018 -0400

    CPPXT-130 - auto_ptr cleanup
    
    https://issues.shibboleth.net/jira/browse/CPPXT-130
---
 shibsp/handler/impl/DiscoveryFeed.cpp | 2 +-
 shibsp/security/PKIXTrustEngine.cpp   | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/shibsp/handler/impl/DiscoveryFeed.cpp b/shibsp/handler/impl/DiscoveryFeed.cpp
index 0f60ec1..3c70db2 100644
--- a/shibsp/handler/impl/DiscoveryFeed.cpp
+++ b/shibsp/handler/impl/DiscoveryFeed.cpp
@@ -92,7 +92,7 @@ namespace shibsp {
         // Each filename is also a cache tag.
         typedef queue< pair<string, time_t> > feedqueue_t;
         mutable map<string,feedqueue_t> m_feedQueues;
-        auto_ptr<Mutex> m_feedLock;
+        scoped_ptr<Mutex> m_feedLock;
 #endif
     };
 
diff --git a/shibsp/security/PKIXTrustEngine.cpp b/shibsp/security/PKIXTrustEngine.cpp
index b65ba12..679390a 100644
--- a/shibsp/security/PKIXTrustEngine.cpp
+++ b/shibsp/security/PKIXTrustEngine.cpp
@@ -249,8 +249,7 @@ void MetadataPKIXIterator::populate()
             // Copy over the information.
             for (vector< boost::shared_ptr<X509Credential> >::const_iterator c = cached->second.begin(); c != cached->second.end(); ++c) {
                 m_certs.insert(m_certs.end(), (*c)->getEntityCertificateChain().begin(), (*c)->getEntityCertificateChain().end());
-                if ((*c)->getCRL())
-                    m_crls.push_back((*c)->getCRL());
+                m_crls.insert(m_crls.end(), (*c)->getCRLs().begin(), (*c)->getCRLs().end());
             }
             return;
         }
@@ -268,8 +267,7 @@ void MetadataPKIXIterator::populate()
     // Copy over the new information.
     for (vector< boost::shared_ptr<X509Credential> >::const_iterator c = m_ownedCreds.begin(); c != m_ownedCreds.end(); ++c) {
         m_certs.insert(m_certs.end(), (*c)->getEntityCertificateChain().begin(), (*c)->getEntityCertificateChain().end());
-        if ((*c)->getCRL())
-            m_crls.push_back((*c)->getCRL());
+        m_crls.insert(m_crls.end(), (*c)->getCRLs().begin(), (*c)->getCRLs().end());
     }
 
     // As a last step, if we're caching, try and elevate to a write lock for cache insertion.

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