From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 25 Mar 2011 13:47:07 +0000 (+0000)
Subject: Allow for no metadata sources.
X-Git-Tag: 1.0.0~25
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp-resolver.git;a=commitdiff_plain;h=42027b967a3db8d5136c2e0b3b13f7dc45b2b1e1

Allow for no metadata sources.
---

diff --git a/src/shibresolver/resolver.cpp b/src/shibresolver/resolver.cpp
index 503ad8c..83b6269 100644
--- a/src/shibresolver/resolver.cpp
+++ b/src/shibresolver/resolver.cpp
@@ -342,9 +342,12 @@ void RemotedResolver::resolve(
 #ifndef SHIBSP_LITE
     Category& log = Category::getInstance(SHIBRESOLVER_LOGCAT);
     pair<const EntityDescriptor*,const RoleDescriptor*> entity = make_pair((EntityDescriptor*)NULL, (RoleDescriptor*)NULL);
-    MetadataProvider* m = app.getMetadataProvider();
+    MetadataProvider* m = app.getMetadataProvider(false);
     Locker locker(m);
-    if (issuer && *issuer) {
+    if (!m) {
+        log.warn("no metadata providers are configured");
+    }
+    else if (issuer && *issuer) {
         // Lookup metadata for the issuer.
         MetadataProviderCriteria mc(app, issuer, &IDPSSODescriptor::ELEMENT_QNAME, samlconstants::SAML20P_NS);
         entity = m->getEntityDescriptor(mc);