From e7713d45a4277901d8663c54893de48f8f6d5796 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Tue, 21 Jul 2015 18:13:44 +0200 Subject: [PATCH] Server Upgrade: addifnew should not create entry addifnew should add value only if entry exists, instead of creating entry. Reviewed-By: David Kupka --- ipaserver/install/ldapupdate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 4457edc4c..5fac58eca 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -663,8 +663,8 @@ class LDAPUpdate: elif action == 'addifnew': self.debug("addifnew: '%s' to %s, current value %s", safe_output(attr, update_value), attr, safe_output(attr, entry_values)) # Only add the attribute if it doesn't exist. Only works - # with single-value attributes. - if len(entry_values) == 0: + # with single-value attributes. Entry must exist. + if entry.get('objectclass') and len(entry_values) == 0: entry_values.append(update_value) self.debug('addifnew: set %s to %s', attr, safe_output(attr, entry_values)) entry[attr] = entry_values