X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=blobdiff_plain;f=shibsp%2Fhandler%2Fimpl%2FTransformSessionInitiator.cpp;h=440668ba11db03d15192ccdc6ece64994d0151f0;hp=fa712d8f9f05f3afdb191e67f0e2ebb400d0894f;hb=20ff6ebf7102e56941b1610fc817023a3dcc9076;hpb=2212bec52d7147d19084b07cc8d08a4ad57e0da3

diff --git a/shibsp/handler/impl/TransformSessionInitiator.cpp b/shibsp/handler/impl/TransformSessionInitiator.cpp
index fa712d8..440668b 100644
--- a/shibsp/handler/impl/TransformSessionInitiator.cpp
+++ b/shibsp/handler/impl/TransformSessionInitiator.cpp
@@ -99,6 +99,9 @@ namespace shibsp {
                             auto_ptr_char repl(e->getFirstChild()->getNodeValue());
                             m_regex.push_back(make_pair((*flag==chDigit_1 || *flag==chLatin_t), pair<string,string>(m.get(), repl.get())));
                         }
+                        else {
+                            m_log.warn("Unknown element found in Transform SessionInitiator configuration, check for errors.");
+                        }
                     }
                     e = XMLHelper::getNextSiblingElement(e);
                 }
@@ -248,6 +251,10 @@ void TransformSessionInitiator::doRequest(const Application& application, string
                 auto_ptr_char narrow(temp);
                 XMLString::release(&temp);
 
+                // For some reason it returns the match string if it doesn't match the expression.
+                if (entityID == narrow.get())
+                    continue;
+
                 if (r->first) {
                     m_log.info("forcibly transformed entityID from (%s) to (%s)", entityID.c_str(), narrow.get());
                     entityID = narrow.get();