mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Fix remove while iterating in suppress_netgroup_memberof.
https://fedorahosted.org/freeipa/ticket/3464
This commit is contained in:
committed by
Martin Kosek
parent
dc5fcc2969
commit
b194b850ca
@@ -364,7 +364,7 @@ class host(LDAPObject):
|
|||||||
"""
|
"""
|
||||||
ng_container = DN(api.env.container_netgroup, api.env.basedn)
|
ng_container = DN(api.env.container_netgroup, api.env.basedn)
|
||||||
if 'memberofindirect' in entry_attrs:
|
if 'memberofindirect' in entry_attrs:
|
||||||
for member in entry_attrs['memberofindirect']:
|
for member in list(entry_attrs['memberofindirect']):
|
||||||
memberdn = DN(member)
|
memberdn = DN(member)
|
||||||
if memberdn.endswith(ng_container):
|
if memberdn.endswith(ng_container):
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ class hostgroup(LDAPObject):
|
|||||||
"""
|
"""
|
||||||
if 'memberof' in entry_attrs:
|
if 'memberof' in entry_attrs:
|
||||||
hgdn = DN(dn)
|
hgdn = DN(dn)
|
||||||
for member in entry_attrs['memberof']:
|
for member in list(entry_attrs['memberof']):
|
||||||
ngdn = DN(member)
|
ngdn = DN(member)
|
||||||
if ngdn['cn'] == hgdn['cn']:
|
if ngdn['cn'] == hgdn['cn']:
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -790,7 +790,6 @@ class test_nesting(Declarative):
|
|||||||
managedby_host=[fqdn1],
|
managedby_host=[fqdn1],
|
||||||
memberof_hostgroup = [u'testhostgroup2'],
|
memberof_hostgroup = [u'testhostgroup2'],
|
||||||
memberofindirect_hostgroup = [u'testhostgroup1'],
|
memberofindirect_hostgroup = [u'testhostgroup1'],
|
||||||
memberofindirect_netgroup = [u'testhostgroup2'],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user