From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 9 Jan 2015 03:16:33 +0000 (+0000)
Subject: https://issues.shibboleth.net/jira/browse/CPPOST-90
X-Git-Tag: 2.5.4~8
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=commitdiff_plain;h=367dff3d45fd14df5fc72cc93079c1270da55324

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

diff --git a/saml/saml2/core/impl/Assertions20SchemaValidators.cpp b/saml/saml2/core/impl/Assertions20SchemaValidators.cpp
index 306232c..9048bfb 100644
--- a/saml/saml2/core/impl/Assertions20SchemaValidators.cpp
+++ b/saml/saml2/core/impl/Assertions20SchemaValidators.cpp
@@ -94,10 +94,7 @@ namespace opensaml {
         END_XMLOBJECTVALIDATOR;
 
         BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Conditions);
-            if (!ptr->hasChildren()) {
-                XMLOBJECTVALIDATOR_ONEOF(Conditions,NotBefore,NotOnOrAfter);
-            }
-            else if (ptr->getOneTimeUses().size() > 1) {
+            if (ptr->getOneTimeUses().size() > 1) {
                 throw ValidationException("Multiple OneTimeUse condition elements are not permitted.");
             }
             else if (ptr->getProxyRestrictions().size() > 1) {