From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 29 Apr 2023 13:19:09 +0000 (+0000)
Subject: users: Fix reading email addresses from LDAP
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82f6d079a2d97929f87ece5636ba5e14d59f7afe;p=pbs.git

users: Fix reading email addresses from LDAP

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 15785057..71d2ff37 100644
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -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(