summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-12-10 11:13:48 +0100
committerPetr Viktorin <pviktori@redhat.com>2014-01-10 14:41:39 +0100
commit24d85f15ee886d8704438045cb0e3568f59a831a (patch)
tree5f9ac079714e50c075148ea96531747dc2c0627d /ipalib
parent7b3d9be388f8e3da3959912061513e40b31926c5 (diff)
downloadfreeipa-24d85f15ee886d8704438045cb0e3568f59a831a.tar.gz
freeipa-24d85f15ee886d8704438045cb0e3568f59a831a.tar.xz
freeipa-24d85f15ee886d8704438045cb0e3568f59a831a.zip
Use old entry state in LDAPClient.update_entry.
https://fedorahosted.org/freeipa/ticket/3488
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/plugins/permission.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py
index 204574697..16d5fc9cf 100644
--- a/ipalib/plugins/permission.py
+++ b/ipalib/plugins/permission.py
@@ -837,6 +837,7 @@ class permission_mod(baseldap.LDAPUpdate):
except Exception:
self.log.error('Error updating ACI: %s' % traceback.format_exc())
self.log.warn('Reverting entry')
+ old_entry.reset_modlist(entry)
ldap.update_entry(old_entry)
self._revert_aci()
raise