diff options
| author | Jose Castro Leon <jose.castro.leon@cern.ch> | 2013-02-06 16:36:15 +0100 |
|---|---|---|
| committer | Jose Castro Leon <jose.castro.leon@cern.ch> | 2013-02-06 16:36:15 +0100 |
| commit | 2930a289773c8c6124971bed66216db91d48c70d (patch) | |
| tree | fd62c2402e376f45361b3fc03abf07cc7cd05ef7 /keystone/common | |
| parent | 8ec247bf61be0e487332d5d891246d2b7b606989 (diff) | |
| download | keystone-2930a289773c8c6124971bed66216db91d48c70d.tar.gz keystone-2930a289773c8c6124971bed66216db91d48c70d.tar.xz keystone-2930a289773c8c6124971bed66216db91d48c70d.zip | |
Tenant update on LDAP breaks if there is no update to apply
Fixes bug 1117362
Change-Id: Ia47f8a7cd38dcaaceafed39cbdd837ba9a67969f
Diffstat (limited to 'keystone/common')
| -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 e767e93e..0dfca9c8 100644 --- a/keystone/common/ldap/core.py +++ b/keystone/common/ldap/core.py @@ -311,8 +311,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: |