Add backward-compatibility hack for aap-uri setting.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@632 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shib-target/shib-config.cpp b/shib-target/shib-config.cpp
index c231d2b..86adc7e 100644 (file)
--- a/shib-target/shib-config.cpp
+++ b/shib-target/shib-config.cpp
@@ -257,6 +257,19 @@ void STConfig::init()
     delete iter;
   }
   
+  // Backward-compatibility-hack to pull in aap-uri from [shire] and load
+  // as attribute metadata. We load this for anything, not just the SHIRE.
+  if (init->get_tag(SHIBTARGET_SHIRE, "aap-uri", false, &tag))
+  {
+    log.info("registering metadata provider: type=edu.internet2.middleware.shibboleth.target.AAP.XML, source=%s",tag.c_str());
+    if (!shibConf.addMetadata("edu.internet2.middleware.shibboleth.target.AAP.XML",tag.c_str()))
+    {
+        log.crit("error adding metadata provider: type=edu.internet2.middleware.shibboleth.target.AAP.XML, source=%s",tag.c_str());
+        if (!strcmp(app.c_str(), SHIBTARGET_SHAR))
+            throw runtime_error("error adding metadata provider");
+    }
+  }
+  
   // Load SAML policies.
   if (ini->exists(SHIBTARGET_POLICIES)) {
     log.info("loading SAML policies");