Allow request map to supply entityID.

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

diff --git a/shibsp/handler/impl/SessionInitiator.cpp b/shibsp/handler/impl/SessionInitiator.cpp
index 6692a12..48f71b1 100644 (file)
--- a/shibsp/handler/impl/SessionInitiator.cpp
+++ b/shibsp/handler/impl/SessionInitiator.cpp
@@ -56,6 +56,12 @@ pair<bool,long> SessionInitiator::run(SPRequest& request, bool isHandler) const
         if (!param.first && (!entityID || !*entityID))
             entityID=request.getParameter("providerId");
     }
+    if (!entityID || !*entityID) {
+        RequestMapper::Settings settings = request.getRequestSettings();
+        param = settings.first->getString("entityID");
+        if (param.first)
+            entityID = param.second;
+    }
     if (!entityID || !*entityID)
         entityID=getString("entityID").second;