|
 |
cdf651 |
From 75710952e74ea6070a53baaf5ea4e80507cdc26c Mon Sep 17 00:00:00 2001
|
|
|
cdf651 |
From: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
cdf651 |
Date: Thu, 21 Jun 2018 12:37:42 +0200
|
|
|
cdf651 |
Subject: [PATCH] TESTS: Allow storing e-mail address for users
|
|
|
cdf651 |
MIME-Version: 1.0
|
|
|
cdf651 |
Content-Type: text/plain; charset=UTF-8
|
|
|
cdf651 |
Content-Transfer-Encoding: 8bit
|
|
|
cdf651 |
|
|
|
cdf651 |
This would allow adding tests for by-e-mail lookups later
|
|
|
cdf651 |
|
|
|
cdf651 |
Related:
|
|
|
cdf651 |
https://pagure.io/SSSD/sssd/issue/3607
|
|
|
cdf651 |
|
|
|
cdf651 |
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
|
cdf651 |
(cherry picked from commit d057eb2e20a19ce975dc2202f7c0e9f204eb9510)
|
|
|
cdf651 |
---
|
|
|
cdf651 |
src/tests/intg/ldap_ent.py | 11 ++++++++---
|
|
|
cdf651 |
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
cdf651 |
|
|
|
cdf651 |
diff --git a/src/tests/intg/ldap_ent.py b/src/tests/intg/ldap_ent.py
|
|
|
cdf651 |
index a4c987969d3dcefba2af69e095b220180e0fa54c..1f23e3ab7a7ee62909babb8338379a5f2d4e37f2 100644
|
|
|
cdf651 |
--- a/src/tests/intg/ldap_ent.py
|
|
|
cdf651 |
+++ b/src/tests/intg/ldap_ent.py
|
|
|
cdf651 |
@@ -25,7 +25,8 @@ def user(base_dn, uid, uidNumber, gidNumber,
|
|
|
cdf651 |
loginShell=None,
|
|
|
cdf651 |
cn=None,
|
|
|
cdf651 |
sn=None,
|
|
|
cdf651 |
- sshPubKey=()):
|
|
|
cdf651 |
+ sshPubKey=(),
|
|
|
cdf651 |
+ mail=None):
|
|
|
cdf651 |
"""
|
|
|
cdf651 |
Generate an RFC2307(bis) user add-modlist for passing to ldap.add*
|
|
|
cdf651 |
"""
|
|
|
cdf651 |
@@ -56,6 +57,8 @@ def user(base_dn, uid, uidNumber, gidNumber,
|
|
|
cdf651 |
if len(sshPubKey) > 0:
|
|
|
cdf651 |
pubkeys = [key.encode('utf-8') for key in sshPubKey]
|
|
|
cdf651 |
user[1].append(('sshPublicKey', pubkeys))
|
|
|
cdf651 |
+ if mail is not None:
|
|
|
cdf651 |
+ user[1].append(('mail', [mail.encode('utf-8')]))
|
|
|
cdf651 |
return user
|
|
|
cdf651 |
|
|
|
cdf651 |
|
|
|
cdf651 |
@@ -124,7 +127,8 @@ class List(list):
|
|
|
cdf651 |
loginShell=None,
|
|
|
cdf651 |
cn=None,
|
|
|
cdf651 |
sn=None,
|
|
|
cdf651 |
- sshPubKey=()):
|
|
|
cdf651 |
+ sshPubKey=(),
|
|
|
cdf651 |
+ mail=None):
|
|
|
cdf651 |
"""Add an RFC2307(bis) user add-modlist."""
|
|
|
cdf651 |
self.append(user(base_dn or self.base_dn,
|
|
|
cdf651 |
uid, uidNumber, gidNumber,
|
|
|
cdf651 |
@@ -134,7 +138,8 @@ class List(list):
|
|
|
cdf651 |
loginShell=loginShell,
|
|
|
cdf651 |
cn=cn,
|
|
|
cdf651 |
sn=sn,
|
|
|
cdf651 |
- sshPubKey=sshPubKey))
|
|
|
cdf651 |
+ sshPubKey=sshPubKey,
|
|
|
cdf651 |
+ mail=mail))
|
|
|
cdf651 |
|
|
|
cdf651 |
def add_group(self, cn, gidNumber, member_uids=[],
|
|
|
cdf651 |
base_dn=None):
|
|
|
cdf651 |
--
|
|
|
cdf651 |
2.17.1
|
|
|
cdf651 |
|