From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 24 May 2012 21:38:08 +0000 (+0000)
Subject: Use default operator of AND
X-Git-Tag: 2.5.0~79
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=9e1f919138f715db49c7f4997f7d0a41e1707f4c

Use default operator of AND
---

diff --git a/shibsp/impl/ChainingAccessControl.cpp b/shibsp/impl/ChainingAccessControl.cpp
index 82dc94b..7681e03 100644
--- a/shibsp/impl/ChainingAccessControl.cpp
+++ b/shibsp/impl/ChainingAccessControl.cpp
@@ -95,14 +95,12 @@ AccessControl::~AccessControl()
 {
 }
 
-ChainingAccessControl::ChainingAccessControl(const DOMElement* e)
+ChainingAccessControl::ChainingAccessControl(const DOMElement* e) : m_op(OP_AND)
 {
     const XMLCh* op = e ? e->getAttributeNS(nullptr, _operator) : nullptr;
-    if (XMLString::equals(op, AND))
-        m_op = OP_AND;
-    else if (XMLString::equals(op, OR))
+    if (XMLString::equals(op, OR))
         m_op = OP_OR;
-    else
+    else if (op && *op && !XMLString::equals(op, AND))
         throw ConfigurationException("Missing or unrecognized operator in Chaining AccessControl configuration.");
 
     e = XMLHelper::getFirstChildElement(e, _AccessControl);