SSPCPP-616 - clean up concatenated string literals

[shibboleth/cpp-sp.git] / shibsp / impl / ChainingAccessControl.cpp

diff --git a/shibsp/impl/ChainingAccessControl.cpp b/shibsp/impl/ChainingAccessControl.cpp
index 9849124..92f972d 100644 (file)
--- a/shibsp/impl/ChainingAccessControl.cpp
+++ b/shibsp/impl/ChainingAccessControl.cpp
@@ -95,22 +95,22 @@ 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);
     while (e) {
         string t(XMLHelper::getAttrString(e, nullptr, _type));
         if (!t.empty()) {
-            Category::getInstance(SHIBSP_LOGCAT".AccessControl.Chaining").info("building AccessControl provider of type (%s)...", t.c_str());
-            m_ac.push_back(SPConfig::getConfig().AccessControlManager.newPlugin(t.c_str(), e));
+            Category::getInstance(SHIBSP_LOGCAT ".AccessControl.Chaining").info("building AccessControl provider of type (%s)...", t.c_str());
+            auto_ptr<AccessControl> np(SPConfig::getConfig().AccessControlManager.newPlugin(t.c_str(), e));
+            m_ac.push_back(np.get());
+            np.release();
         }
         e = XMLHelper::getNextSiblingElement(e, _AccessControl);
     }