diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-14 02:11:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-14 02:11:22 +0000 |
| commit | fc9ded38d93c6c91faf47de7881d5c528b0ee3fc (patch) | |
| tree | 6d3db539cdbb59ba0a78ea8b643f7e7646201cba | |
| parent | 1f685153435aba5bc387f598599c8684daae30cf (diff) | |
| parent | 2930a289773c8c6124971bed66216db91d48c70d (diff) | |
Merge "Tenant update on LDAP breaks if there is no update to apply"
| -rw-r--r-- | keystone/common/ldap/core.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py index 3ef834c6..eca2084d 100644 --- a/keystone/common/ldap/core.py +++ b/keystone/common/ldap/core.py @@ -310,8 +310,9 @@ class BaseLdap(object): op = ldap.MOD_REPLACE modlist.append((op, self.attribute_mapping.get(k, k), [v])) - conn = self.get_connection() - conn.modify_s(self._id_to_dn(id), modlist) + if modlist: + conn = self.get_connection() + conn.modify_s(self._id_to_dn(id), modlist) def delete(self, id): if not self.allow_delete: |