- const EntityDescriptor* entity = metadata->getEntityDescriptor(issuer);\r
- if (!entity)\r
- throw MetadataException("no metadata found for ($1)", params(1, issuer));\r
- const XMLCh* ns = rns ? XMLString::transcode(rns) : samlconstants::SAML20MD_NS;\r
- auto_ptr_XMLCh n(rname);\r
- QName q(ns, n.get());\r
- const RoleDescriptor* role = entity->getRoleDescriptor(q, protocol);\r
- if (!role)\r
- throw MetadataException("compatible role $1 not found for ($2)", params(2, q.toString().c_str(), issuer));\r
-\r
- MetadataCredentialCriteria mcc(*role);\r
- if (sigtrust->validate(*signable->getSignature(), *metadata.get(), &mcc))\r
+ MetadataProvider::Criteria mc(issuer, &q, protocol);
+ pair<const EntityDescriptor*,const RoleDescriptor*> entity = metadata->getEntityDescriptor(mc);
+ if (!entity.first)
+ throw MetadataException("no metadata found for ($1)", params(1, issuer));
+ else if (!entity.second)
+ throw MetadataException("compatible role $1 not found for ($2)", params(2, q.toString().c_str(), issuer));
+
+ MetadataCredentialCriteria mcc(*entity.second);
+ if (sigtrust->validate(*signable->getSignature(), *metadata.get(), &mcc))