If no name_qualifier is chosen use the IdPs entity id.

Author: Roland Hedberg

src/saml2/ident.py

@@ -195,6 +195,11 @@ def construct_nameid(self, userid, local_policy=None,
         """
 
         args = self.nim_args(local_policy, sp_name_qualifier, name_id_policy)
+        if name_qualifier:
+            args["name_qualifier"] = name_qualifier
+        else:
+            args["name_qualifier"] = self.name_qualifier
+
         return self.get_nameid(userid, **args)
 
     def transient_nameid(self, userid, sp_name_qualifier="", name_qualifier=""):

src/saml2/server.py

@@ -130,6 +130,8 @@ def init_config(self, stype="idp"):
             raise Exception("Couldn't open identity database: %s" %
                             (dbspec,))
 
+        self.ident.name_qualifier = self.config.entityid
+
         dbspec = self.config.getattr("edu_person_targeted_id", "idp")
         if not dbspec:
             pass
@@ -431,8 +433,7 @@ def create_authn_response(self, identity, in_response_to, destination,
                 else:
                     name_id = self.ident.construct_nameid(userid, policy,
                                                           sp_entity_id,
-                                                          name_id_policy,
-                                                          nid_formats)
+                                                          name_id_policy)
             except IOError, exc:
                 response = self.create_error_response(in_response_to,
                                                       destination,