CPPOST-15 - Adds APIs to support advanced metadata providers.

[shibboleth/cpp-sp.git] / util / mdquery.cpp

diff --git a/util/mdquery.cpp b/util/mdquery.cpp
index 00e1e49..33435cc 100644 (file)
--- a/util/mdquery.cpp
+++ b/util/mdquery.cpp
@@ -35,6 +35,7 @@
 #include <shibsp/exceptions.h>\r
 #include <shibsp/SPConfig.h>\r
 #include <shibsp/ServiceProvider.h>\r
+#include <shibsp/metadata/MetadataProviderCriteria.h>\r
 #include <shibsp/util/SPConstants.h>\r
 #include <saml/saml2/metadata/Metadata.h>\r
 #include <xmltooling/logging.h>\r
@@ -106,7 +107,7 @@ int main(int argc,char* argv[])
     XMLToolingConfig::getConfig().log_config(getenv("SHIBSP_LOGGING") ? getenv("SHIBSP_LOGGING") : SHIBSP_LOGGING);\r
 \r
     SPConfig& conf=SPConfig::getConfig();\r
-    conf.setFeatures(SPConfig::Metadata | SPConfig::OutOfProcess);\r
+    conf.setFeatures(SPConfig::Metadata | SPConfig::Trust | SPConfig::OutOfProcess | SPConfig::Credentials);\r
     if (!conf.init(path))\r
         return -1;\r
 \r
@@ -153,7 +154,7 @@ int main(int argc,char* argv[])
     }\r
 \r
     app->getMetadataProvider()->lock();\r
-    MetadataProvider::Criteria mc(entityID, NULL, NULL, strict);\r
+    MetadataProviderCriteria mc(*app, entityID, NULL, NULL, strict);\r
     if (rname) {\r
         const XMLCh* ns = rns ? XMLString::transcode(rns) : samlconstants::SAML20MD_NS;\r
         auto_ptr_XMLCh n(rname);\r