Improve property inheritance, first batch of SessionInitiators, rename providerId.

[shibboleth/sp.git] / shibsp / attribute / resolver / impl / SimpleAttributeResolver.cpp

diff --git a/shibsp/attribute/resolver/impl/SimpleAttributeResolver.cpp b/shibsp/attribute/resolver/impl/SimpleAttributeResolver.cpp
index 90ac16a..4424921 100644 (file)
--- a/shibsp/attribute/resolver/impl/SimpleAttributeResolver.cpp
+++ b/shibsp/attribute/resolver/impl/SimpleAttributeResolver.cpp
@@ -325,7 +325,7 @@ void SimpleResolverImpl::resolve(
     vector<shibsp::Attribute*>& resolved = ctx.getResolvedAttributes();\r
 \r
     auto_ptr_char assertingParty(ctx.getEntityDescriptor() ? ctx.getEntityDescriptor()->getEntityID() : NULL);\r
-    const char* relyingParty = ctx.getApplication().getString("providerId").second;\r
+    const char* relyingParty = ctx.getApplication().getString("entityID").second;\r
 \r
 #ifdef HAVE_GOOD_STL\r
     map< pair<xstring,xstring>,pair<const AttributeDecoder*,string> >::const_iterator rule;\r
@@ -391,7 +391,7 @@ void SimpleResolverImpl::resolve(
     vector<shibsp::Attribute*>& resolved = ctx.getResolvedAttributes();\r
 \r
     auto_ptr_char assertingParty(ctx.getEntityDescriptor() ? ctx.getEntityDescriptor()->getEntityID() : NULL);\r
-    const char* relyingParty = ctx.getApplication().getString("providerId").second;\r
+    const char* relyingParty = ctx.getApplication().getString("entityID").second;\r
 \r
 #ifdef HAVE_GOOD_STL\r
     map< pair<xstring,xstring>,pair<const AttributeDecoder*,string> >::const_iterator rule;\r
@@ -452,7 +452,7 @@ void SimpleResolverImpl::resolve(
 \r
         const vector<saml2::EncryptedAttribute*>& encattrs = const_cast<const saml2::AttributeStatement*>(*s)->getEncryptedAttributes();\r
         if (!encattrs.empty()) {\r
-            const XMLCh* recipient = ctx.getApplication().getXMLString("providerId").second;\r
+            const XMLCh* recipient = ctx.getApplication().getXMLString("entityID").second;\r
             CredentialResolver* cr = ctx.getApplication().getCredentialResolver();\r
             if (!cr) {\r
                 Category::getInstance(SHIBSP_LOGCAT".AttributeResolver").warn(\r
@@ -533,7 +533,7 @@ void SimpleResolverImpl::query(ResolutionContext& ctx, const NameIdentifier& nam
             if (!XMLString::equals((*ep)->getBinding(),binding.get()))\r
                 continue;\r
             auto_ptr_char loc((*ep)->getLocation());\r
-            auto_ptr_XMLCh issuer(ctx.getApplication().getString("providerId").second);\r
+            auto_ptr_XMLCh issuer(ctx.getApplication().getString("entityID").second);\r
             saml1::Subject* subject = saml1::SubjectBuilder::buildSubject();\r
             subject->setNameIdentifier(nameid.cloneNameIdentifier());\r
             saml1p::AttributeQuery* query = saml1p::AttributeQueryBuilder::buildAttributeQuery();\r
@@ -645,7 +645,7 @@ void SimpleResolverImpl::query(ResolutionContext& ctx, const NameID& nameid, con
             if (!XMLString::equals((*ep)->getBinding(),binding.get()))\r
                 continue;\r
             auto_ptr_char loc((*ep)->getLocation());\r
-            auto_ptr_XMLCh issuer(ctx.getApplication().getString("providerId").second);\r
+            auto_ptr_XMLCh issuer(ctx.getApplication().getString("entityID").second);\r
             saml2::Subject* subject = saml2::SubjectBuilder::buildSubject();\r
             subject->setNameID(nameid.cloneNameID());\r
             saml2p::AttributeQuery* query = saml2p::AttributeQueryBuilder::buildAttributeQuery();\r