Use the correct attribute names.

src/saml2/assertion.py

@@ -459,6 +459,7 @@ class Policy(object):
         
         :param ava: The information about the subject as a dictionary
         :param sp_entity_id: The entity ID of the SP
+        :param mdstore: A Metadata store
         :param required: Attributes that the SP requires in the assertion
         :param optional: Attributes that the SP regards as optional
         :return: A possibly modified AVA
@@ -489,7 +490,7 @@ class Policy(object):
                 ava = self.filter(ava, sp_entity_id, metadata,
                                   spec["required"], spec["optional"])
 
-        return self.filter(ava, sp_entity_id, [], [])
+        return self.filter(ava, sp_entity_id, metadata, [], [])
 
     def conditions(self, sp_entity_id):
         """ Return a saml.Condition instance

src/saml2/entity_category/edugain.py

@@ -5,6 +5,6 @@ COC = "http://www.edugain.org/dataprotection/coc-eu-01-draft"
 RELEASE = {
     "": ["eduPersonTargetedID"],
     COC: ["eduPersonPrincipalName", "eduPersonScopedAffiliation", "email",
-          "givenName", "surname", "displayName", "schacHomeOrganization"]
+          "givenName", "sn", "displayName", "schacHomeOrganization"]
 }
 

src/saml2/entity_category/swamid.py

@@ -1,7 +1,7 @@
 __author__ = 'rolandh'
 
 
-NAME = ["givenName", "surname", "initials", "displayName"]
+NAME = ["givenName", "initials", "displayName", "sn"]
 STATIC_ORG_INFO = ["c", "o", "ou"]
 OTHER = ["eduPersonPrincipalName", "eduPersonScopedAffiliation", "email"]