diff options
| author | Pavel Zuna <pzuna@redhat.com> | 2009-07-07 11:00:48 +0200 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2009-07-07 22:56:56 -0400 |
| commit | f59cab1ccdb6a0257c7316e42774e5fdd8a9afed (patch) | |
| tree | 3e84aa5994aa36261236ce212e5087219b981a00 /ipaserver | |
| parent | ac2970e52ffa27946f63ed01d0acd8f25a35cb53 (diff) | |
| download | freeipa-f59cab1ccdb6a0257c7316e42774e5fdd8a9afed.tar.gz freeipa-f59cab1ccdb6a0257c7316e42774e5fdd8a9afed.tar.xz freeipa-f59cab1ccdb6a0257c7316e42774e5fdd8a9afed.zip | |
Fix bug in ldap2.modify_password and make adding/removing members slightly more efficient.
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/plugins/ldap2.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index 97c02d1c7..586c31f95 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -561,7 +561,7 @@ class ldap2(CrudBackend, Encoder): """Set user password.""" dn = self.normalize_dn(dn) try: - self.passwd_s(dn, old_pass, new_pass) + self.conn.passwd_s(dn, old_pass, new_pass) except _ldap.LDAPError, e: _handle_errors(e, **{}) @@ -575,10 +575,10 @@ class ldap2(CrudBackend, Encoder): if dn == group_dn: raise errors.SameGroupError() # check if the entry exists - (dn, entry_attrs) = self.get_entry(dn, ['objectclass']) + (dn, entry_attrs) = self.get_entry(dn, ['objectclass'], ['']) # get group entry - (group_dn, group_entry_attrs) = self.get_entry(group_dn) + (group_dn, group_entry_attrs) = self.get_entry(group_dn, [member_attr]) # add dn to group entry's `member_attr` attribute members = group_entry_attrs.get(member_attr, []) @@ -598,7 +598,7 @@ class ldap2(CrudBackend, Encoder): dn = self.normalize_dn(dn) # get group entry - (group_dn, group_entry_attrs) = self.get_entry(group_dn) + (group_dn, group_entry_attrs) = self.get_entry(group_dn, [member_attr]) # remove dn from group entry's `member_attr` attribute members = group_entry_attrs.get(member_attr, []) |