From 24d85f15ee886d8704438045cb0e3568f59a831a Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Tue, 10 Dec 2013 11:13:48 +0100
Subject: Use old entry state in LDAPClient.update_entry.

https://fedorahosted.org/freeipa/ticket/3488
---
 ipalib/plugins/permission.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ipalib')

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
-- 
cgit