IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

IPA-EPN: Don't treat givenname differently

Browse Source 
This was returning givenname as a list and not as a single
string which messed up the templating.

https://pagure.io/freeipa/issue/3687
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Francois Cami <fcami@redhat.com>
This commit is contained in:
Rob Crittenden 2020-06-09 16:02:30 -04:00
parent cb205cc5e4
commit ba7974bfd1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipaclient/install/ipa_epn.py
View File

@ -133,7 +133,7 @@ class EPNUserList:
dict( dict(
uid=str(entry["uid"].pop(0)), uid=str(entry["uid"].pop(0)),
cn=str(entry["cn"].pop(0)), cn=str(entry["cn"].pop(0)),
givenname=str(entry.get("givenname", "")), givenname=str(entry["givenname"].pop(0)),
sn=str(entry["sn"].pop(0)), sn=str(entry["sn"].pop(0)),
krbpasswordexpiration=str( krbpasswordexpiration=str(
entry["krbpasswordexpiration"].pop(0) entry["krbpasswordexpiration"].pop(0)
@ -438,7 +438,7 @@ class EPN(admintool.AdminTool):
search_base = DN(api.env.container_user, api.env.basedn) search_base = DN(api.env.container_user, api.env.basedn)
attrs_list = ["uid", "krbpasswordexpiration", "mail", "cn", attrs_list = ["uid", "krbpasswordexpiration", "mail", "cn",
"gn", "surname"] "givenname", "surname"]
search_filter = ( search_filter = (
"(&(!(nsaccountlock=TRUE)) \ "(&(!(nsaccountlock=TRUE)) \

6
ipatests/test_integration/test_epn.py
View File

@ -373,7 +373,7 @@ class TestEPN(IntegrationTest):
tasks.ipa_epn(self.master) tasks.ipa_epn(self.master)
for i in self.notify_ttls: for i in self.notify_ttls:
validate_mail(self.master, i, validate_mail(self.master, i,
"Hi user,\nYour login entry user%d is going" % i) "Hi test user,\nYour login entry user%d is going" % i)
def test_mailtest(self, cleanupmail): def test_mailtest(self, cleanupmail):
"""Execute mailtest to validate mail is working """Execute mailtest to validate mail is working
@ -422,7 +422,7 @@ class TestEPN(IntegrationTest):
tasks.ipa_epn(self.master) tasks.ipa_epn(self.master)
for i in self.notify_ttls: for i in self.notify_ttls:
validate_mail(self.master, i, validate_mail(self.master, i,
"Hi user,\nYour login entry user%d is going" % i) "Hi test user,\nYour login entry user%d is going" % i)
def test_EPN_ssl(self, cleanupmail): def test_EPN_ssl(self, cleanupmail):
"""Configure with ssl and test delivery """Configure with ssl and test delivery
@ -441,7 +441,7 @@ class TestEPN(IntegrationTest):
tasks.ipa_epn(self.master) tasks.ipa_epn(self.master)
for i in self.notify_ttls: for i in self.notify_ttls:
validate_mail(self.master, i, validate_mail(self.master, i,
"Hi user,\nYour login entry user%d is going" % i) "Hi test user,\nYour login entry user%d is going" % i)
def test_EPN_delay_config(self, cleanupmail): def test_EPN_delay_config(self, cleanupmail):
"""Test the smtp_delay configuration option """Test the smtp_delay configuration option