Change audience handling and validators to separate out entityID.

[shibboleth/sp.git] / shibsp / Application.h

diff --git a/shibsp/Application.h b/shibsp/Application.h
index d9bd87c..9660e7a 100644 (file)
--- a/shibsp/Application.h
+++ b/shibsp/Application.h
@@ -172,11 +172,11 @@ namespace shibsp {
         virtual const PropertySet* getRelyingParty(const opensaml::saml2md::EntityDescriptor* provider) const=0;
 
         /**
-         * Returns the set of audience values associated with this Application.
+         * Returns any additional audience values associated with this Application.
          * 
-         * @return set of audience values associated with the Application
+         * @return additional audience values associated with the Application, or NULL
          */
-        virtual const std::vector<const XMLCh*>& getAudiences() const=0;
+        virtual const std::vector<const XMLCh*>* getAudiences() const=0;
 #endif
 
         /**
@@ -190,12 +190,11 @@ namespace shibsp {
         virtual std::string getNotificationURL(const char* request, bool front, unsigned int index) const=0;
 
         /**
-         * Returns a set of attribute IDs to use as a REMOTE_USER value.
-         * <p>The first attribute with a value (and only a single value) will be used.
+         * Returns an array of attribute IDs to use as a REMOTE_USER value, in order of preference.
          *
-         * @return  a set of attribute IDs, or an empty set
+         * @return  an array of attribute IDs, possibly empty
          */
-        virtual const std::set<std::string>& getRemoteUserAttributeIds() const=0;
+        virtual const std::vector<std::string>& getRemoteUserAttributeIds() const=0;
 
         /**
          * Clears any headers that may be used to hold attributes after export.