https://issues.shibboleth.net/jira/browse/CPPOST-14

diff --git a/saml/saml2/metadata/MetadataFilter.h b/saml/saml2/metadata/MetadataFilter.h
index a4482d9..81762e7 100644 (file)
--- a/saml/saml2/metadata/MetadataFilter.h
+++ b/saml/saml2/metadata/MetadataFilter.h
@@ -77,6 +77,9 @@ namespace opensaml {
 
         /** MetadataFilter that verifies signatures and filters out any that don't pass. */
         #define SIGNATURE_METADATA_FILTER  "Signature"
+
+        /** MetadataFilter that enforces expiration requirements. */
+        #define REQUIREVALIDUNTIL_METADATA_FILTER  "RequireValidUntil"
         
         DECL_XMLTOOLING_EXCEPTION(MetadataFilterException,SAML_EXCEPTIONAPI(SAML_API),opensaml::saml2md,MetadataException,Exceptions related to metadata filtering);
     };

diff --git a/saml/saml2/metadata/MetadataProvider.h b/saml/saml2/metadata/MetadataProvider.h
index 59f826a..834e8ae 100644 (file)
--- a/saml/saml2/metadata/MetadataProvider.h
+++ b/saml/saml2/metadata/MetadataProvider.h
@@ -155,7 +155,7 @@ namespace opensaml {
             /**
              * Batches up criteria for entity lookup.
              */
-            struct Criteria {
+            struct SAML_API Criteria {
                 /**
                  * Constructor.
                  * 
@@ -192,6 +192,8 @@ namespace opensaml {
                     : entityID_unicode(NULL), entityID_ascii(NULL), artifact(a), role(q), protocol(prot), protocol2(NULL), validOnly(valid) {
                 }
                 
+                virtual ~Criteria() {}
+                
                 /** Unique ID of entity. */
                 const XMLCh* entityID_unicode;
                 /** Unique ID of entity. */