Fix SIDP-72, for real this time.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2498 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java
index 833acee..48cd420 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java
@@ -306,6 +306,7 @@ public abstract class AbstractSAML2ProfileHandler extends AbstractSAMLProfileHan
         //TODO we should only do this for certain outgoing bindings, not globally
         Audience audience = audienceBuilder.buildObject();
         audience.setAudienceURI(requestContext.getInboundMessageIssuer());
+        audienceRestriction.getAudiences().add(audience);
         audiences = profileConfig.getAssertionAudiences();
         if (audiences != null && audiences.size() > 0) {
             for (String audienceUri : audiences) {

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
index ca3fcf0..84e9101 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
@@ -34,7 +34,6 @@ import org.opensaml.saml2.core.AuthnContextClassRef;
 import org.opensaml.saml2.core.AuthnContextDeclRef;
 import org.opensaml.saml2.core.AuthnRequest;
 import org.opensaml.saml2.core.AuthnStatement;
-import org.opensaml.saml2.core.NameID;
 import org.opensaml.saml2.core.RequestedAuthnContext;
 import org.opensaml.saml2.core.Response;
 import org.opensaml.saml2.core.Statement;