From c0c38ed3143963ae3308423294c53454d901a716 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Tue, 4 Feb 2014 11:39:35 +0100 Subject: Fix modlist generation code not to generate empty replace mods. https://fedorahosted.org/freeipa/ticket/4138 Reviewed-By: Petr Viktorin --- ipapython/ipaldap.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py index 074e0c219..699bf70c6 100644 --- a/ipapython/ipaldap.py +++ b/ipapython/ipaldap.py @@ -978,12 +978,12 @@ class LDAPEntry(collections.MutableMapping): names = set(self.iterkeys()) names.update(self._orig) for name in names: - new = self.raw.get(name) - old = self._orig.get(name) + new = self.raw.get(name, []) + old = self._orig.get(name, []) if old and not new: modlist.append((ldap.MOD_DELETE, name, None)) continue - if not old: + if not old and new: modlist.append((ldap.MOD_REPLACE, name, new)) continue -- cgit