Rework address handling based on app/location.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2195 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp
index e67dfa8..1d48f54 100644 (file)
--- a/shibsp/impl/XMLServiceProvider.cpp
+++ b/shibsp/impl/XMLServiceProvider.cpp
@@ -384,7 +384,7 @@ XMLApplication::XMLApplication(
                         child = XMLHelper::getNextSiblingElement(child);\r
                         continue;\r
                     }\r
-                    handler=conf.AssertionConsumerServiceManager.newPlugin(bindprop.get(),child);\r
+                    handler=conf.AssertionConsumerServiceManager.newPlugin(bindprop.get(),make_pair(child, getId()));\r
                     // Map by binding (may be > 1 per binding, e.g. SAML 1.0 vs 1.1)\r
 #ifdef HAVE_GOOD_STL\r
                     m_acsBindingMap[handler->getXMLString("Binding").second].push_back(handler);\r
@@ -412,7 +412,7 @@ XMLApplication::XMLApplication(
                         child = XMLHelper::getNextSiblingElement(child);\r
                         continue;\r
                     }\r
-                    handler=conf.SessionInitiatorManager.newPlugin(bindprop.get(),child);\r
+                    handler=conf.SessionInitiatorManager.newPlugin(bindprop.get(),make_pair(child, getId()));\r
                     pair<bool,const char*> si_id=handler->getString("id");\r
                     if (si_id.first && si_id.second)\r
                         m_sessionInitMap[si_id.second]=handler;\r
@@ -435,7 +435,7 @@ XMLApplication::XMLApplication(
                         child = XMLHelper::getNextSiblingElement(child);\r
                         continue;\r
                     }\r
-                    handler=conf.SingleLogoutServiceManager.newPlugin(bindprop.get(),child);\r
+                    handler=conf.SingleLogoutServiceManager.newPlugin(bindprop.get(),make_pair(child, getId()));\r
                 }\r
                 else if (XMLHelper::isNodeNamed(child,samlconstants::SAML20MD_NS,ManageNameIDService::LOCAL_NAME)) {\r
                     auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME));\r
@@ -444,7 +444,7 @@ XMLApplication::XMLApplication(
                         child = XMLHelper::getNextSiblingElement(child);\r
                         continue;\r
                     }\r
-                    handler=conf.ManageNameIDServiceManager.newPlugin(bindprop.get(),child);\r
+                    handler=conf.ManageNameIDServiceManager.newPlugin(bindprop.get(),make_pair(child, getId()));\r
                 }\r
                 else {\r
                     auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
@@ -453,7 +453,7 @@ XMLApplication::XMLApplication(
                         child = XMLHelper::getNextSiblingElement(child);\r
                         continue;\r
                     }\r
-                    handler=conf.HandlerManager.newPlugin(type.get(),child);\r
+                    handler=conf.HandlerManager.newPlugin(type.get(),make_pair(child, getId()));\r
                 }\r
 \r
                 // Save off the objects after giving the property set to the handler for its use.\r