Imported Upstream version 2.1.dfsg1

[shibboleth/sp.git] / shibsp / handler / impl / MetadataGenerator.cpp

diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp
index 685c398..08e73e0 100644 (file)
--- a/shibsp/handler/impl/MetadataGenerator.cpp
+++ b/shibsp/handler/impl/MetadataGenerator.cpp
@@ -27,6 +27,10 @@
 #include "handler/AbstractHandler.h"
 #include "handler/RemotedHandler.h"
 
+#ifndef SHIBSP_LITE
+# include "metadata/MetadataProviderCriteria.h"
+#endif
+
 #include <xercesc/framework/LocalFileInputSource.hpp>
 #include <xercesc/framework/Wrapper4InputSource.hpp>
 
@@ -211,11 +215,11 @@ pair<bool,long> MetadataGenerator::processMessage(
     if (entityID) {
         MetadataProvider* m=application.getMetadataProvider();
         Locker locker(m);
-        MetadataProvider::Criteria mc(entityID);
+        MetadataProviderCriteria mc(application, entityID);
         relyingParty = application.getRelyingParty(m->getEntityDescriptor(mc).first);
     }
     else {
-        relyingParty = application.getRelyingParty(NULL);
+        relyingParty = &application;
     }
 
     EntityDescriptor* entity;