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

Fix bug in basegroup and passwd plugins (incorrect use of find_entry_by_attr).

Browse Source
This commit is contained in:
Pavel Zuna 2009-06-18 19:18:06 +02:00 committed by Rob Crittenden
parent 4b6a6c405c
commit 341a47f5a3
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ipalib/plugins/basegroup.py
View File

@ -48,7 +48,7 @@ def find_members(ldap, failed, members, attr, object_class, parent_dn=''):
if not m: continue
try:
(member_dn, entry_attrs) = ldap.find_entry_by_attr(
attr, m, object_class, parent_dn
attr, m, object_class, [''], parent_dn
)
found.append(member_dn)
except errors.NotFound:
@ -197,7 +197,7 @@ class basegroup_del(crud.Delete):
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.find_entry_by_attr(
'cn', cn, self.filter_class, self.container
'cn', cn, self.filter_class, [''], self.container
)
ldap.delete_entry(dn)
@ -238,7 +238,7 @@ class basegroup_mod(crud.Update):
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.find_entry_by_attr(
'cn', cn, self.filter_class, self.container_dn
'cn', cn, self.filter_class, [''], self.container_dn
)
entry_attrs = self.args_options_2_entry(cn, **kw)
@ -362,16 +362,14 @@ class basegroup_show(crud.Retrieve):
assert self.container
ldap = self.api.Backend.ldap2
(dn, entry_attrs) = ldap.find_entry_by_attr(
'cn', cn, self.filter_class, self.container
)
if kw['all']:
attrs_list = ['*']
else:
attrs_list = self.default_attributes
return ldap.get_entry(dn, attrs_list)
return ldap.find_entry_by_attr(
'cn', cn, self.filter_class, attrs_list, self.container
)
def output_for_cli(self, textui, result, *args, **options):
(dn, entry_attrs) = result
@ -424,8 +422,8 @@ class basegroup_add_member(Command):
add_failed = []
completed = 0
(dn, entry_attrs) = ldap.find_entry_by_attrs(
'cn', cn, self.filter_class, self.container
(dn, entry_attrs) = ldap.find_entry_by_attr(
'cn', cn, self.filter_class, [''], self.container
)
members = kw.get('groups', [])
@ -503,8 +501,8 @@ class basegroup_del_member(Command):
remove_failed = []
completed = 0
(dn, entry_attrs) = ldap.find_entry_by_attrs(
'cn', cn, self.filter_class, self.container
(dn, entry_attrs) = ldap.find_entry_by_attr(
'cn', cn, self.filter_class, [''], self.container
)
members = kw.get('groups', [])

4
ipalib/plugins/passwd.py
View File

@ -61,8 +61,8 @@ class passwd(Command):
else:
principal = '%s@%s' % (principal, self.api.env.realm)
dn = ldap.find_entry_by_attr(
'krbprincipalname', principal, 'posixaccount'
(dn, entry_attrs) = ldap.find_entry_by_attr(
'krbprincipalname', principal, 'posixaccount', ['']
)
ldap.modify_password(dn, password)