]> git.ipfire.org Git - pbs.git/commitdiff
users: Fix reading email addresses from LDAP
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Apr 2023 13:19:09 +0000 (13:19 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Apr 2023 15:06:20 +0000 (15:06 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/buildservice/users.py

index 1578505783ee2061a4f3c96aa5d722e8b610c1f0..71d2ff37177798c0fa9c3325aa6ec83fdad0960b 100644 (file)
@@ -25,7 +25,7 @@ LDAP_ATTRS = (
        "cn",
 
        # First & Last Name
-       "givenName", "sn"
+       "givenName", "sn",
 
        # Email Addresses
        "mail",
@@ -372,14 +372,17 @@ class User(base.DataObject):
                """
                        The primary email address
                """
-               return self._get_attr("email")
+               return self._get_attr("mail")
 
        @property
        def email_to(self):
                """
                        The name/email address of the user in MIME format
                """
-               return email.utils.formataddr((self.name, self.email or "invalid@invalid.tld"))
+               return email.utils.formataddr((
+                       self.realname or self.name,
+                       self.email or "invalid@invalid.tld",
+               ))
 
        def send_email(self, *args, **kwargs):
                return self.backend.messages.send_template(